diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-06-23 14:19:35 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-06-23 14:19:35 +0000 |
| commit | cdbb0e2bf77447878c9061f55b6340b3c92fe9be (patch) | |
| tree | 45abd9138bc044aa1b15db34c99ce253080baeb4 /Makefile | |
| parent | 0d0fadc7817486a7fb20b8f2b0ad30459f282073 (diff) | |
merge changes to get menuselect using svn:externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -392,8 +392,8 @@ makeopts: configure @echo "****" @exit 1 -menuselect.makeopts: build_tools/menuselect makeopts.xml - @build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@ +menuselect.makeopts: menuselect/menuselect makeopts.xml + @menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@ #ifneq ($(wildcard tags),) ctags: tags @@ -871,11 +871,11 @@ uninstall-all: _uninstall rm -rf $(DESTDIR)$(ASTETCDIR) rm -rf $(DESTDIR)$(ASTLOGDIR) -menuselect: build_tools/menuselect makeopts.xml - -@build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" +menuselect: menuselect/menuselect makeopts.xml + -@menuselect/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" -build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h config.status mxml/libmxml.a $(MENUSELECT_OBJS) - $(MAKE) -C build_tools menuselect +menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h config.status mxml/libmxml.a $(MENUSELECT_OBJS) + @CFLAGS="-include ../include/asterisk/autoconfig.h" $(MAKE) -C menuselect menuselect mxml/libmxml.a: @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure |