diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-08 21:00:16 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-08 21:00:16 +0000 |
| commit | fdb839ee42307abd4de20445effd51aac1ca5f3d (patch) | |
| tree | 9273d299a8fe84b33fe0133b7e407df82b489e47 /Makefile | |
| parent | c185afc30d448996374e8b10d5d406826b4ba069 (diff) | |
make sure that the MOD_SUBDIR_CFLAGS and OTHER_SUBDIR_FLAGS come before
ASTCFLAGS so that -Iinclude comes before any system include path
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25686 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -528,7 +528,7 @@ include/asterisk/version.h: rm -f $@.tmp stdtime/libtime.a: - CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a + CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) build_tools/make_build_h > include/asterisk/build.h.tmp @@ -543,9 +543,9 @@ muted: muted.o $(CC) $(AUDIO_LIBS) -o muted muted.o subdirs: - @for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done - @CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils - @CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi + @for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C $$x || exit 1 ; done + @CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C utils + @CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C agi clean-depend: @for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done |