[svn-commits] trunk r36461 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Jun 30 22:21:06 2006
New Revision: 36461

URL: http://svn.digium.com/view/asterisk?rev=36461&view=rev
Log:
menuselect doesn't pull strcompat.o from asterisk anymore

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=36461&r1=36460&r2=36461&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Jun 30 22:21:06 2006
@@ -351,7 +351,6 @@
 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 @@
 menuselect: menuselect/menuselect makeopts.xml
 	- at 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: