[zaptel-commits] russell: trunk r1344 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Aug 22 22:42:18 2006
New Revision: 1344

URL: http://svn.digium.com/view/zaptel?rev=1344&view=rev
Log:
update to reflect menuselect changes

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Aug 22 22:42:18 2006
@@ -1,2 +1,1 @@
-menuselect     http://svn.digium.com/svn/menuselect/trunk
-mxml	       http://svn.digium.com/svn/mxml/trunk
+menuselect     http://svn.digium.com/svn/menuselect/branches/1.0

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1344&r1=1343&r2=1344&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Aug 22 22:42:18 2006
@@ -521,7 +521,6 @@
 
 dist-clean: clean
 	@$(MAKE) -C menuselect dist-clean
-	@$(MAKE) -C mxml clean
 	rm -f makeopts menuselect.makeopts
 	rm -f config.log config.status
 
@@ -539,9 +538,5 @@
 menuselect: menuselect/menuselect menuselect-tree
 	- at 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_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
-	@CFLAGS="" PARENTSRC="$(PWD)" $(MAKE) -C menuselect menuselect
-
-mxml/libmxml.a:
-	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
-	$(MAKE) -C mxml libmxml.a
+menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status
+	@CFLAGS="" PARENTSRC="$(PWD)" $(MAKE) -C menuselect