[svn-commits] branch group/menuselect r1142 - /team/group/menuselect/build_tools/Makefile

svn-commits at lists.digium.com svn-commits at lists.digium.com
Tue Jun 20 08:00:28 MST 2006


Author: russell
Date: Tue Jun 20 10:00:28 2006
New Revision: 1142

URL: http://svn.digium.com/view/zaptel?rev=1142&view=rev
Log:
use autoconf info for building menuselect

Modified:
    team/group/menuselect/build_tools/Makefile

Modified: team/group/menuselect/build_tools/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/build_tools/Makefile?rev=1142&r1=1141&r2=1142&view=diff
==============================================================================
--- team/group/menuselect/build_tools/Makefile (original)
+++ team/group/menuselect/build_tools/Makefile Tue Jun 20 10:00:28 2006
@@ -1,6 +1,14 @@
 MENUSELECT_OBJS=menuselect.o menuselect_curses.o
 MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -DMENUSELECT -I..
-MENUSELECT_LIBS=../mxml/libmxml.a -lncurses
+MENUSELECT_LIBS=../mxml/libmxml.a
+
+ifneq ($(NCURSES_LIB),)
+  MENUSELECT_LIBS+=$(NCURSES_LIB)
+  MENUSELECT_INCLUDE=$(NCURSES_INCLUDE)
+else
+  MENUSELECT_LIBS+=$(CURSES_LIB)
+  MENUSELECT_INCLUDE=$(CURSES_INCLUDE)
+endif 
 
 menuselect: $(MENUSELECT_OBJS)
 	$(CC) -g -Wall -o $@ $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
@@ -9,7 +17,7 @@
 	$(CC) -Wall -o $@ $(MENUSELECT_CFLAGS) $<
 
 menuselect_curses.o: menuselect_curses.c menuselect.h
-	$(CC) -Wall -o $@ $(MENUSELECT_CFLAGS) $<
+	$(CC) -Wall -o $@ $(MENUSELECT_CFLAGS) $(MENUSELECT_INCLUDE) $<
 
 clean:
 	rm -f menuselect *.o



More information about the svn-commits mailing list