menuselect doesn't pull strcompat.o from asterisk anymore
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36461 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
ba98f584d6
commit
e895b094b9
1 changed files with 1 additions and 2 deletions
3
Makefile
3
Makefile
|
@ -351,7 +351,6 @@ endif
|
||||||
ifeq ($(OSARCH),SunOS)
|
ifeq ($(OSARCH),SunOS)
|
||||||
LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
|
LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
|
||||||
OBJS+=strcompat.o
|
OBJS+=strcompat.o
|
||||||
MENUSELECT_OBJS+=strcompat.o
|
|
||||||
ASTLINK=
|
ASTLINK=
|
||||||
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
|
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
|
||||||
endif
|
endif
|
||||||
|
@ -885,7 +884,7 @@ uninstall-all: _uninstall
|
||||||
menuselect: menuselect/menuselect makeopts.xml
|
menuselect: menuselect/menuselect makeopts.xml
|
||||||
-@menuselect/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
|
-@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
|
@CFLAGS="-include $(PWD)/include/asterisk/autoconfig.h" PARENTSRC="$(PWD)" $(MAKE) -C menuselect menuselect
|
||||||
|
|
||||||
mxml/libmxml.a:
|
mxml/libmxml.a:
|
||||||
|
|
Reference in a new issue