Merge pull request #12 from mithro/makefile-fix
Fix Makefile dependency inclusion for other software.
This commit is contained in:
commit
688c66dda1
|
@ -11,6 +11,9 @@ libbase.a: $(OBJECTS) vsnprintf.o
|
||||||
libbase-nofloat.a: $(OBJECTS) vsnprintf-nofloat.o
|
libbase-nofloat.a: $(OBJECTS) vsnprintf-nofloat.o
|
||||||
$(AR) crs libbase-nofloat.a $(OBJECTS) vsnprintf-nofloat.o
|
$(AR) crs libbase-nofloat.a $(OBJECTS) vsnprintf-nofloat.o
|
||||||
|
|
||||||
|
# pull in dependency info for *existing* .o files
|
||||||
|
-include $(OBJECTS:.o=.d)
|
||||||
|
|
||||||
vsnprintf-nofloat.o: $(LIBBASE_DIRECTORY)/vsnprintf.c
|
vsnprintf-nofloat.o: $(LIBBASE_DIRECTORY)/vsnprintf.c
|
||||||
$(call compile,-DNO_FLOAT)
|
$(call compile,-DNO_FLOAT)
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,9 @@ libcompiler_rt.a: $(OBJECTS)
|
||||||
$(CC) -c $(CFLAGS) $(1) $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c -o mulsi3.o
|
$(CC) -c $(CFLAGS) $(1) $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c -o mulsi3.o
|
||||||
$(AR) crs libcompiler_rt.a $(OBJECTS)
|
$(AR) crs libcompiler_rt.a $(OBJECTS)
|
||||||
|
|
||||||
|
# pull in dependency info for *existing* .o files
|
||||||
|
-include $(OBJECTS:.o=.d)
|
||||||
|
|
||||||
mulsi3.o: $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c
|
mulsi3.o: $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c
|
||||||
$(compile)
|
$(compile)
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,9 @@ all: libnet.a
|
||||||
libnet.a: $(OBJECTS)
|
libnet.a: $(OBJECTS)
|
||||||
$(AR) crs libnet.a $(OBJECTS)
|
$(AR) crs libnet.a $(OBJECTS)
|
||||||
|
|
||||||
|
# pull in dependency info for *existing* .o files
|
||||||
|
-include $(OBJECTS:.o=.d)
|
||||||
|
|
||||||
%.o: $(LIBNET_DIRECTORY)/%.c
|
%.o: $(LIBNET_DIRECTORY)/%.c
|
||||||
$(compile)
|
$(compile)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue