diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | build_tools/Makefile | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -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: diff --git a/build_tools/Makefile b/build_tools/Makefile index b5336e30c..d5d5df043 100644 --- a/build_tools/Makefile +++ b/build_tools/Makefile @@ -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) $< |