Revision: 6335
http://playerstage.svn.sourceforge.net/playerstage/?rev=6335&view=rev
Author: thjc
Date: 2008-04-16 02:10:27 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
merged distcheck fixes from 2.1
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/bindings/python/Makefile.am
code/player/trunk/libplayercore/Makefile.am
Modified: code/player/trunk/client_libs/libplayerc/bindings/python/Makefile.am
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/python/Makefile.am
2008-04-16 07:30:08 UTC (rev 6334)
+++ code/player/trunk/client_libs/libplayerc/bindings/python/Makefile.am
2008-04-16 09:10:27 UTC (rev 6335)
@@ -20,6 +20,7 @@
playerc_oo.i: ../../playerc.h $(top_srcdir)/libplayercore/player.h
$(srcdir)/playerc_swig_parse.py
if test ! -s ../../playerc.h; then cp $(srcdir)/../../playerc.h ../../;
fi
if test ! -s $(top_builddir)/libplayercore/player.h; then cp
$(top_srcdir)/libplayercore/player.h $(top_builddir)/libplayercore/; fi
+ if test ! -s $(top_builddir)/libplayercore/player_interfaces.h; then cp
$(top_srcdir)/libplayercore/player_interfaces.h $(top_builddir)/libplayercore/;
fi
if test ! -s playerc.i; then cp $(srcdir)/playerc.i .; fi
python $(srcdir)/playerc_swig_parse.py ../../playerc.h playerc_oo.i
@@ -34,8 +35,8 @@
# Use distutils to build module
pythonbuild: playerc_oo.i ../../playerc.h srcbuilddirs.py
- if test ! -s
$(top_builddir)/client_libs/libplayerc/bindings/python/setup.py; then cp
$(srcdir)/setup.py
$(top_builddir)/client_libs/libplayerc/bindings/python/setup.py; fi
- python $(top_builddir)/client_libs/libplayerc/bindings/python/setup.py
build
+ if test ! -s $(builddir)/setup.py; then cp $(srcdir)/setup.py
$(builddir)/setup.py; fi
+ python $(builddir)/setup.py build
# For distcheck builds, clean up the files we created in the build tree
# This generates warnings, so I'm relying on the top-level Makefile.am
override.
@@ -53,7 +54,8 @@
# use distutils to install
pythoninstall:
- python $(srcdir)/setup.py install --prefix=$(DESTDIR)/$(prefix)
+ if test ! -s $(builddir)/setup.py; then cp $(srcdir)/setup.py
$(builddir)/setup.py; fi
+ python $(builddir)/setup.py install --prefix=$(DESTDIR)/$(prefix)
# seems that distutils doesn't support 'uninstall', oh well
uninstall-local:
Modified: code/player/trunk/libplayercore/Makefile.am
===================================================================
--- code/player/trunk/libplayercore/Makefile.am 2008-04-16 07:30:08 UTC (rev
6334)
+++ code/player/trunk/libplayercore/Makefile.am 2008-04-16 09:10:27 UTC (rev
6335)
@@ -6,11 +6,11 @@
dist_bin_SCRIPTS = playerinterfacegen.py
-EXTRA_DIST = playercore.pc.in playererror.pc.in playerutils.pc.in
interfaces/ADDING_INTERFACES player_interfaces.h interface_table.c $(shell find
$(srcdir)/interfaces -name "*.def")
+EXTRA_DIST = playercore.pc.in playererror.pc.in playerutils.pc.in
interfaces/ADDING_INTERFACES $(shell find $(srcdir)/interfaces -name "*.def")
BUILT_SOURCES = playerconfig.h player_interfaces.h interface_table.c
CLEANFILES = playercore.pc playererror.pc playerutils.pc
-DISTCLEANFIELS = playerconfig.h
+DISTCLEANFIELS = $BUILT_SOURCES
lib_LTLIBRARIES = libplayererror.la libplayerutils.la libplayercore.la
@@ -26,7 +26,7 @@
globals.cc globals.h \
property.cpp property.h
libplayercore_la_LDFLAGS = $(PLAYER_VERSION_INFO) -rpath $(libdir)
$(top_builddir)/libplayercore/libplayererror.la
$(top_builddir)/libplayercore/libplayerutils.la
-libplayercore_la_DEPENDENCIES =
$(top_builddir)/libplayercore/libplayererror.la
$(top_builddir)/libplayercore/libplayerutils.la player_interfaces.h
+libplayercore_la_DEPENDENCIES =
$(top_builddir)/libplayercore/libplayererror.la
$(top_builddir)/libplayercore/libplayerutils.la
$(top_builddir)/libplayercore/player_interfaces.h
libplayererror_la_SOURCES = error.h error.c
libplayererror_la_LDFLAGS = $(PLAYER_VERSION_INFO) -rpath $(libdir)
@@ -59,9 +59,10 @@
player_interfaces.h
player_interfaces.h: $(srcdir)/interfaces/* playerinterfacegen.py
- python $(srcdir)/playerinterfacegen.py >
$(top_builddir)/libplayercore/player_interfaces.h
+ python $(srcdir)/playerinterfacegen.py > $(builddir)/player_interfaces.h
# if ! ./playerinterfacegen.py > player_interfaces.h; then rm
player_interfaces.h; fi
interface_table.c: $(srcdir)/interfaces/* playerinterfacegen.py
python $(srcdir)/playerinterfacegen.py --utils >
$(top_builddir)/libplayercore/interface_table.c
# if ! ./playerinterfacegen.py --utils > interface_table.c; then rm
interface_table.c; fi
+
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 the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
