menuselect doesn't pull strcompat.o from asterisk anymore
authorRussell Bryant <russell@russellbryant.com>
Sat, 1 Jul 2006 03:21:06 +0000 (03:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 1 Jul 2006 03:21:06 +0000 (03:21 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36461 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 0def03c..d825d82 100644 (file)
--- 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: