summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2006-07-01 03:21:06 +0000
committerRussell Bryant <russell@russellbryant.com>2006-07-01 03:21:06 +0000
commit03f2685c76abb1526d3cb626d0eee10e9bc5d44d (patch)
tree0e536cd7ec982e06ff2e1c3051ce10d68d0c2f63 /Makefile
parent90f8e459e593eea8ea3f2374a4c5fb16e18573ac (diff)
menuselect doesn't pull strcompat.o from asterisk anymore
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0def03cce..d825d82b8 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,6 @@ endif
ifeq ($(OSARCH),SunOS)
LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
OBJS+=strcompat.o
- MENUSELECT_OBJS+=strcompat.o
ASTLINK=
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
endif
@@ -885,7 +884,7 @@ uninstall-all: _uninstall
menuselect: menuselect/menuselect makeopts.xml
-@menuselect/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a $(MENUSELECT_OBJS)
+menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
@CFLAGS="-include $(PWD)/include/asterisk/autoconfig.h" PARENTSRC="$(PWD)" $(MAKE) -C menuselect menuselect
mxml/libmxml.a: