diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-24 14:33:37 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-24 14:33:37 +0000 |
| commit | 54c6729f43ce0bcb6679f3ea3c42f770ae289b93 (patch) | |
| tree | b0be1ff8a8683295a17ea3041b33a31f7292da63 /makefiles/Makefile.top | |
| parent | 8644d3146cf5dde9c5e7767bf8690387e59550ea (diff) | |
| download | buildsystem-54c6729f43ce0bcb6679f3ea3c42f770ae289b93.tar.gz buildsystem-54c6729f43ce0bcb6679f3ea3c42f770ae289b93.tar.bz2 | |
Makefile.subdir no longer auto-adds the directory to the include path.
Fix canned command sequences to ensure that $(CFLAGS)/$(TESTCFLAGS) is evaluated when the command is run, rather than at parse time.
Reorder setting up of TEST(CFLAGS|LDFLAGS) to ensure that any dependent libraries appear after our component. Also ensure these variables are reevaluated when used.
svn path=/trunk/tools/buildsystem/; revision=6839
Diffstat (limited to 'makefiles/Makefile.top')
| -rw-r--r-- | makefiles/Makefile.top | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index aa8bf6f..fc96296 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -310,7 +310,7 @@ ifeq ($(CC_CAN_BUILD_AND_DEP),yes) define build_c $$(BUILDDIR)/$2: $$(BUILDDIR)/stamp $1 $$(VQ)$$(ECHO) $$(ECHOFLAGS) " COMPILE: $1" - $$(Q)$$(CC) -MMD -MP $($3) -o $$@ -c $1 + $$(Q)$$(CC) -MMD -MP $$($3) -o $$@ -c $1 endef else @@ -319,8 +319,8 @@ else define dep_c $$(BUILDDIR)/$2: $$(BUILDDIR)/stamp $1 $$(VQ)$$(ECHO) $$(ECHOFLAGS) " DEP: $1" - $$(Q)$$(RM)$($@) - $$(Q)$$(CC) $($3) -MM $1 > $$@ + $$(Q)$$(RM) $$(RMFLAGS) $($@) + $$(Q)$$(CC) $$($3) -MM $1 > $$@ $$(Q)$$(SED) $$(SEDFLAGS) -i 's,^.*:,$$@ $$(@:.d=.o):,' $$@ DEPFILES += $$(BUILDDIR)/$2 @@ -330,7 +330,7 @@ else define build_c $$(BUILDDIR)/$2: $$(BUILDDIR)/stamp $1 $$(VQ)$$(ECHO) $$(ECHOFLAGS) " COMPILE: $1" - $$(Q)$$(CC) $($3) -o $$@ -c $1 + $$(Q)$$(CC) $$($3) -o $$@ -c $1 endef endif @@ -345,18 +345,18 @@ $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ # Similarly for test sources ifeq ($(MAKECMDGOALS),test) - TESTCFLAGS := $(TESTCFLAGS) $(CFLAGS) - TESTLDFLAGS := $(TESTLDFLAGS) $(LDFLAGS) - ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) TESTLIB := $(OUTPUT) - TESTLDFLAGS := $(TESTLDFLAGS) -L$(BUILDDIR)/ -l$(COMPONENT) + TESTLDFLAGS += -L$(BUILDDIR)/ -l$(COMPONENT) endif + TESTCFLAGS += $(CFLAGS) + TESTLDFLAGS += $(LDFLAGS) + define link_test $2: $($3) $1 $$(VQ)$$(ECHO) $$(ECHOFLAGS) " LINK: $2" - $$(Q)$$(CC) -o $$@ $1 $($4) + $$(Q)$$(CC) -o $$@ $1 $$($4) endef |