diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-05-13 10:54:40 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-05-13 10:54:40 +0000 |
| commit | a3ed43f0dc50b04d05beabcd72f3cef631990877 (patch) | |
| tree | 42f5e2f2c429bc7d8e761fd2f88efccbc4f6b0ea /Makefile | |
| parent | cec3a958e411e5727bdc618827529f3af923645d (diff) | |
Move WITH_SMDI from the Makefiles to be handled by menuselect. It will now be
defined in buildopts.h. Also, remove a few more stray spaces in the gcc commands.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@27130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -59,9 +59,6 @@ OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) DEBUG=-g3 -# Asterisk SMDI integration -WITH_SMDI=1 - # Staging directory # Files are copied here temporarily during the install process # For example, make DESTDIR=/tmp/asterisk woud put things in @@ -365,7 +362,7 @@ ifeq ($(OSARCH),SunOS) endif ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) - CFLAGS+=$(TOPDIR_CFLAGS) $(ASTCFLAGS) + CFLAGS+=$(TOPDIR_CFLAGS)$(ASTCFLAGS) endif # This is used when generating the doxygen documentation @@ -487,7 +484,7 @@ include/asterisk/buildopts.h: menuselect.makeopts @rm -f $@.tmp stdtime/libtime.a: - CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a + CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) build_tools/make_build_h > include/asterisk/build.h.tmp @@ -502,9 +499,9 @@ muted: muted.o $(CC) $(AUDIO_LIBS) -o muted muted.o subdirs: - @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 + @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 |