X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.tpl;h=57e49be26baa89f1f5173a0d4798f32f7f42f5ad;hb=4ad6151eb6d3138c9070cb376f5ba9fa3ec511e8;hp=350eb08f61b181ec9718ac3cb28ef1c453782e5f;hpb=7ab41f4e18165ed116576d0872e6faa41a1981f2;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 350eb08f..57e49be2 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -35,19 +35,23 @@ $(_BIN): $(OBJ) $(_LIBS)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
 	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
+	@$(DISASM) -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
 	@mkdir -p $(dir $@)
-	@$(CC) $(CFLAGS) -o $@ -c $<
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $@.dep
 
-$(_OBJPREFIX)%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
 	@echo [AS] -o $@
 	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) -o $@ $<
+ifeq ($(ASSUFFIX),S)
+	@$(AS) $(ASFLAGS) -o $@.dep $< -M
+else
 	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
+endif
 
 #$(OUTPUTDIR)Libs/libld-acess.so:
 #	@make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/