don't build strcompat for menuselect except on Solaris
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 9 May 2006 07:51:20 +0000 (07:51 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 9 May 2006 07:51:20 +0000 (07:51 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25893 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
build_tools/Makefile

index 4e70403..b976df8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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:
index b5336e3..d5d5df0 100644 (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) $<