Revision: 444 http://vde.svn.sourceforge.net/vde/?rev=444&view=rev Author: rd235 Date: 2010-08-15 17:40:19 +0000 (Sun, 15 Aug 2010)
Log Message: ----------- Autotool support for python dir Modified Paths: -------------- trunk/vde-2/configure.ac trunk/vde-2/src/lib/Makefile.am Added Paths: ----------- trunk/vde-2/src/lib/python/Makefile.am Removed Paths: ------------- trunk/vde-2/src/lib/python/Makefile Modified: trunk/vde-2/configure.ac =================================================================== --- trunk/vde-2/configure.ac 2010-08-14 15:49:47 UTC (rev 443) +++ trunk/vde-2/configure.ac 2010-08-15 17:40:19 UTC (rev 444) @@ -24,12 +24,14 @@ [add_cryptcab_support=yes], [add_cryptcab_support=no ; warn_cryptcab=yes]) -PYTHONINCLUDEDIR=`python -c "from distutils.sysconfig import get_python_inc; print get_python_inc();"` +AM_PATH_PYTHON([2.5], [add_python_support=yes], [add_python_support=warn]) +PYTHONINCLUDEDIR=`python2.5 -c "from distutils.sysconfig import get_python_inc; print get_python_inc();"` AC_CHECK_HEADERS([$PYTHONINCLUDEDIR/Python.h], [add_python_support=yes], [add_python_support=no; warn_python=no]) AC_CHECK_LIB([pcap], [pcap_open_dead], [add_pcap=yes], [add_pcap=no ; warn_pcap=yes]) +AC_SUBST(PYTHONINCLUDEDIR) # Checks for header files. AC_HEADER_STDC @@ -205,6 +207,7 @@ [src/lib/vdemgmt.pc] [src/lib/vdeplug.pc] [src/lib/vdehist.pc] + [src/lib/python/Makefile] [src/vde_switch/Makefile] [src/kvde_switch/Makefile] [src/vde_over_ns/Makefile] Modified: trunk/vde-2/src/lib/Makefile.am =================================================================== --- trunk/vde-2/src/lib/Makefile.am 2010-08-14 15:49:47 UTC (rev 443) +++ trunk/vde-2/src/lib/Makefile.am 2010-08-15 17:40:19 UTC (rev 444) @@ -1,6 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\"" LIBADD = $(top_builddir)/src/common/libvdecommon.la +SUBDIRS = if ENABLE_PROFILE AM_CFLAGS = -pg --coverage @@ -28,7 +29,7 @@ libvdehist_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic if ENABLE_PYTHON - SUBDIRS = python +SUBDIRS += python endif pkgconfigdir = $(libdir)/pkgconfig Deleted: trunk/vde-2/src/lib/python/Makefile =================================================================== --- trunk/vde-2/src/lib/python/Makefile 2010-08-14 15:49:47 UTC (rev 443) +++ trunk/vde-2/src/lib/python/Makefile 2010-08-15 17:40:19 UTC (rev 444) @@ -1,27 +0,0 @@ -PYTHONINCLUDEDIR=`python -c "from distutils.sysconfig import get_python_inc; print get_python_inc();"` -PYTHONLIBDIR=`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib();"` - - - -all: vdeplug_python.so - -vdeplug_python.o: vdeplug_python.c - gcc -c vdeplug_python.c -I /usr/include/python2.5 - -vdeplug_python.so: vdeplug_python.o - gcc -shared vdeplug_python.o /usr/lib/libvdeplug.so -o vdeplug_python.so - -distclean: clean - -clean: - rm -f *.so *.o *.pyc - -install: - install vdeplug_python.so $(PYTHONLIBDIR) - @echo INCLUDES are in $(PYTHONINCLUDEDIR) - @echo LIBS are in $(PYTHONLIBDIR) - install VdePlug.py $(PYTHONLIBDIR) - -uninstall: - rm -f $(PREFIX)/lib/vdeplug_python.so - rm -f $(PYTHONLIBDIR)/VdePlug.py Added: trunk/vde-2/src/lib/python/Makefile.am =================================================================== --- trunk/vde-2/src/lib/python/Makefile.am (rev 0) +++ trunk/vde-2/src/lib/python/Makefile.am 2010-08-15 17:40:19 UTC (rev 444) @@ -0,0 +1,12 @@ +moddir = $(pythondir) + +AM_LIBTOOLFLAGS = --tag=disable-static + +LIBADD = $(top_builddir)/src/lib/libvdeplug.so + +mod_LTLIBRARIES = vdeplug_python.la +dist_python_SCRIPTS = VdePlug.py + +vdeplug_python_la_CFLAGS = $(PYTHON_CFLAGS) -I$(PYTHONINCLUDEDIR) +vdeplug_python_la_LIBADD = $(PYTHON_LIBS) +vdeplug_python_la_LDFLAGS = -module -avoid-version This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ vde-users mailing list vde-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vde-users