Usermode - Renamed readdir() to SysReadDir()

[tpg/acess2.git] / Usermode / Libraries / Makefile.tpl

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 7a46c51..e252210 100644 (file)
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -19,7 +19,7 @@ DEPFILES := $(addsuffix .dep,$(OBJ))
 all: $(_BIN) $(_XBIN)
 
 clean:
-       $(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
+       $(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
 
 install: all
        @echo [xCP] $(DISTROOT)/Libs/$(BIN)
@@ -30,24 +30,31 @@ install: all
 ifneq ($(_XBIN),)
        $(xCP) $(_XBIN) $(DISTROOT)/Libs/
 endif
+#ifneq ($(INCFILES),)
+#      for f in $(INCFILES); do ln -s $f $(ACESSDIR)/include/$f; done
+#endif
 
-$(_BIN): $(OBJ)
+$(_BIN): $(OBJ) $(_LIBS)
        @mkdir -p $(dir $(_BIN))
        @echo [LD] -o $(BIN) $(OBJ)
-       @$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-       @$(DISASM) $(_BIN) > $(_BIN).dsm
+       @$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
+       @$(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 [email protected]
 
-$(_OBJPREFIX)%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
        @echo [AS] -o $@
        @mkdir -p $(dir $@)
        @$(AS) $(ASFLAGS) -o $@ $<
+ifeq ($(ASSUFFIX),S)
+       @$(AS) $(ASFLAGS) -o [email protected] $< -M
+else
        @$(AS) $(ASFLAGS) -o $@ $< -M > [email protected]
+endif
 
 #$(OUTPUTDIR)Libs/libld-acess.so:
 #      @make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/