dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

don't build strcompat for menuselect except on Solaris 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25893 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-05-09 07:51:20 +00:00
parent 30357417c9
commit 909bd6a98c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -405,6 +405,7 @@ endif
ifeq ($(OSARCH),SunOS)
LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -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
@ -999,7 +1000,7 @@ uninstall-all: _uninstall
menuselect: build_tools/menuselect makeopts.xml
-@build_tools/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 include/autoconfig.h strcompat.o mxml/libmxml.a
build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h include/autoconfig.h mxml/libmxml.a $(MENUSELECT_OBJS)
$(MAKE) -C build_tools menuselect
mxml/libmxml.a:

6
build_tools/Makefile
View File

@ -2,6 +2,10 @@ MENUSELECT_OBJS=menuselect.o menuselect_curses.o
MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -I../ -I../include/
MENUSELECT_LIBS=../mxml/libmxml.a
ifeq ($(OSARCH),SunOS)
MENUSELECT_OBJS+=../strcompat.o
endif
ifneq ($(NCURSES_LIB),)
MENUSELECT_LIBS+=$(NCURSES_LIB)
MENUSELECT_INCLUDE=$(NCURSES_INCLUDE)
@ -11,7 +15,7 @@ else
endif
menuselect: $(MENUSELECT_OBJS)
$(CC) -g -o $@ ../strcompat.o $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
$(CC) -g -o $@ $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
menuselect.o: menuselect.c menuselect.h
$(CC) -o $@ $(MENUSELECT_CFLAGS) $<