Changeset 079f440 in mainline for uspace/lib/Makefile.common

Timestamp:

2010-01-16T20:59:55Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94790d01

Parents:

cf240cb

Message:

Also use common make rules for libc.

File:

• uspace/lib/Makefile.common (modified) (4 diffs)

uspace/lib/Makefile.common

@@ -48 +48 @@
 JOB = $(OUTPUT).job
 
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
 
+-include $(USPACE_PREFIX)/../Makefile.config
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -63 +64 @@
     $(LIBS) \
     \
-    $(OUTPUT)
+    $(OUTPUT) \
+    $(EXTRA_OUTPUT)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT)
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
         find . -name '*.o' -follow -exec rm \{\} \;
 
@@ -77 +79 @@
         $(AR) rc $@ $(OBJECTS)
 
+%.o: %.S $(DEPEND)
+        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__
+endif
+
+%.o: %.s $(DEPEND)
+        $(AS) $(AFLAGS) $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm $(AFLAGS)
+endif
+
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
@@ -83 +97 @@
 endif
 
-$(DEPEND):
+$(DEPEND): $(PRE_DEPEND)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@