diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 16:38:46 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 16:38:46 +0000 |
| commit | 16312049c6b96730edb7ad6f0aaa83908767440b (patch) | |
| tree | db41d0b3bc0f43bd5e89c43b68542dd35bef2c7a /Makefile | |
| parent | 60b3bb94a29950520220fa19bc079fe9972641d4 (diff) | |
Merged revisions 43993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43993 | kpfleming | 2006-09-29 11:38:27 -0500 (Fri, 29 Sep 2006) | 2 lines
a couple more environment settings that can't leak into the menuselect build
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43994 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -646,7 +646,7 @@ menuselect: menuselect/menuselect menuselect-tree -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts - @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" + @unset CC LD AR RANLIB CFLAGS LDFLAGS && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml @echo "Generating input for menuselect ..." |