[Opensrf-commits] r1739 - in trunk/src: . c-apps gateway java jserver libopensrf perl python router srfsh (sboyette)

svn at svn.open-ils.org svn at svn.open-ils.org
Thu Aug 13 15:58:10 EDT 2009 

Author: sboyette
Date: 2009-08-13 15:58:05 -0400 (Thu, 13 Aug 2009)
New Revision: 1739

Modified:
   trunk/src/Makefile.am
   trunk/src/c-apps/Makefile.am
   trunk/src/gateway/Makefile.am
   trunk/src/java/Makefile.am
   trunk/src/jserver/Makefile.am
   trunk/src/libopensrf/Makefile.am
   trunk/src/perl/Makefile.am
   trunk/src/python/Makefile.am
   trunk/src/router/Makefile.am
   trunk/src/srfsh/Makefile.am
Log:
Added DISTCLEANFILES to make "make distclean" work better

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -21,6 +21,7 @@
 export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
 etcdir = $(ETCDIR)
 
+DISTCLEANFILES = Makefile.in Makefile
 
 AM_LDFLAGS = $(DEF_LDFLAGS)
 AM_CFLAGS = $(DEF_CFLAGS)

Modified: trunk/src/c-apps/Makefile.am
===================================================================
--- trunk/src/c-apps/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/c-apps/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -15,6 +15,8 @@
 AM_CFLAGS = $(DEF_CFLAGS) -DORSF_LOG_PARAMS 
 AM_LDFLAGS = $(DEF_LDFLAGS) -L at top_builddir@/src/libopensrf
 
+DISTCLEANFILES = Makefile.in Makefile
+
 noinst_PROGRAMS = timejson
 lib_LTLIBRARIES = osrf_dbmath.la osrf_math.la osrf_version.la
 

Modified: trunk/src/gateway/Makefile.am
===================================================================
--- trunk/src/gateway/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/gateway/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -17,6 +17,8 @@
 AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I at abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
 AM_LDFLAGS = -L$(LIBDIR) -L at top_builddir@/src/libopensrf
 
+DISTCLEANFILES = Makefile.in Makefile
+
 install-exec-local: 
 	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
 		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \

Modified: trunk/src/java/Makefile.am
===================================================================
--- trunk/src/java/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/java/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -1,3 +1,5 @@
+DISTCLEANFILES = Makefile.in Makefile
+
 JAVAC=javac -J-Xmx256m
 JAVA=java -Xmx256m 
 JAVA_LIBDIR = .lib
@@ -53,5 +55,3 @@
 
 dep_clean:
 	rm -rf deps
-
- 	

Modified: trunk/src/jserver/Makefile.am
===================================================================
--- trunk/src/jserver/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/jserver/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -16,6 +16,8 @@
 AM_CFLAGS = $(DEF_CFLAGS) -D_GNU_SOURCE -L at top_builddir@/src/libopensrf
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
+DISTCLEANFILES = Makefile.in Makefile
+
 bin_PROGRAMS = chopchop
 chopchop_SOURCES = osrf_chat.c osrf_chat.h osrf_chat_main.c
 

Modified: trunk/src/libopensrf/Makefile.am
===================================================================
--- trunk/src/libopensrf/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/libopensrf/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -16,6 +16,8 @@
 AM_LDFLAGS = $(DEF_LDFLAGS) -R $(libdir)
 LDADD = -lxml2 -ldl -lmemcache -lopensrf
 
+DISTCLEANFILES = Makefile.in Makefile
+
 OSRF_INC = @top_srcdir@/include/opensrf
 
 TARGS = 		osrf_message.c \

Modified: trunk/src/perl/Makefile.am
===================================================================
--- trunk/src/perl/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/perl/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -11,6 +11,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+DISTCLEANFILES = Makefile.in Makefile
+
 all:
 	perl Build.PL || make -s install-perl-fail
 
@@ -22,3 +24,7 @@
 	echo ">>> See the messages above this one for more information."
 	echo
 	exit 1
+
+distclean-local:
+	rm -rf ./_build
+	rm -rf ./blib
\ No newline at end of file

Modified: trunk/src/python/Makefile.am
===================================================================
--- trunk/src/python/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/python/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -1,5 +1,7 @@
 # makefile for OpenSRF Python modules and scripts
 
+DISTCLEANFILES = Makefile.in Makefile
+
 all-local:
 	@echo $@
 	python @srcdir@/setup.py build
@@ -12,11 +14,11 @@
 	python @srcdir@/setup.py install
 
 distclean-local:
-	rm @builddir@/OpenSRF.egg-info/PKG-INFO
-	rm @builddir@/OpenSRF.egg-info/requires.txt
-	rm @builddir@/OpenSRF.egg-info/top_level.txt
-	rm @builddir@/OpenSRF.egg-info/SOURCES.txt
-	rm @builddir@/OpenSRF.egg-info/dependency_links.txt
-	rm @builddir@/build/scripts-2.5/srfsh.py
-	rm @builddir@/dist/OpenSRF-1.0.0-py2.5.egg
+	rm -f @builddir@/OpenSRF.egg-info/PKG-INFO
+	rm -f @builddir@/OpenSRF.egg-info/requires.txt
+	rm -f @builddir@/OpenSRF.egg-info/top_level.txt
+	rm -f @builddir@/OpenSRF.egg-info/SOURCES.txt
+	rm -f @builddir@/OpenSRF.egg-info/dependency_links.txt
+	rm -f @builddir@/build/scripts-2.5/srfsh.py
+	rm -f @builddir@/dist/OpenSRF-1.0.0-py2.5.egg
 

Modified: trunk/src/router/Makefile.am
===================================================================
--- trunk/src/router/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/router/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -16,6 +16,8 @@
 AM_CFLAGS = $(DEF_CFLAGS) -D_ROUTER -L at top_builddir@/src/libopensrf
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
+DISTCLEANFILES = Makefile.in Makefile
+
 bin_PROGRAMS = opensrf_router
 opensrf_router_SOURCES = osrf_router.c osrf_router_main.c osrf_router.h 
 

Modified: trunk/src/srfsh/Makefile.am
===================================================================
--- trunk/src/srfsh/Makefile.am	2009-08-13 19:58:04 UTC (rev 1738)
+++ trunk/src/srfsh/Makefile.am	2009-08-13 19:58:05 UTC (rev 1739)
@@ -16,5 +16,7 @@
 AM_CFLAGS = $(DEF_CFLAGS) -DEXEC_DEFAULT -L at top_builddir@/src/libopensrf
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
+DISTCLEANFILES = Makefile.in Makefile
+
 bin_PROGRAMS = srfsh
 srfsh_SOURCES = srfsh.c

More information about the opensrf-commits mailing list