commit: r288 - in trunk: . daemon examples libspread

[email protected]
Newsgroups gmane.network.spread.cvs
Message-ID <[email protected]>
Author: jonathan
Date: 2006-02-08 03:20:18 -0500 (Wed, 08 Feb 2006)
New Revision: 288

Added:
   trunk/bin/
   trunk/lib/
Modified:
   trunk/Makefile.in
   trunk/daemon/Makefile.in
   trunk/examples/Makefile.in
   trunk/libspread/Makefile.in
Log:
Add binrelease target to Makefiles to enable building combined binary release
into the bin and lib directories. This new target would be used after a general
./make 
in order to move relevant libraries and binaries into the bin/ and lib/ dirs.
It would not be used on a normal client installation where the typical
make install 
target should be used.


Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2006-02-08 08:18:04 UTC (rev 287)
+++ trunk/Makefile.in	2006-02-08 08:20:18 UTC (rev 288)
@@ -1,4 +1,5 @@
 SUBDIRS=stdutil/src daemon docs libspread examples 
+BINSUBDIRS=daemon libspread examples
 
 all: $(SUBDIRS) 
 	for dir in $(SUBDIRS); do \
@@ -26,6 +27,11 @@
 veryclean: distclean
 	rm -f configure
 
+binrelease: $(BINSUBDIRS) 
+	for dir in $(BINSUBDIRS); do \
+		( $(MAKE) -C $$dir binrelease); \
+	done
+
 install: $(SUBDIRS) 
 	for dir in $(SUBDIRS); do \
 		( $(MAKE) -C $$dir install); \

Modified: trunk/daemon/Makefile.in
===================================================================
--- trunk/daemon/Makefile.in	2006-02-08 08:18:04 UTC (rev 287)
+++ trunk/daemon/Makefile.in	2006-02-08 08:20:18 UTC (rev 288)
@@ -13,6 +13,7 @@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 buildtoolsdir=$(top_srcdir)/buildtools
+host=@host@
 
 DESTDIR=
 VPATH=@srcdir@
@@ -102,6 +103,12 @@
 distclean: clean
 	rm -f Makefile config.h config.status *~
 
+binrelease: $(TARGETS)
+	$(buildtoolsdir)/mkinstalldirs ../bin/$(host)
+	$(INSTALL) -m 0755 -s spmonitor$(EXEEXT) ../bin/$(host)/spmonitor$(EXEEXT)
+	$(INSTALL) -m 0755 -s spread$(EXEEXT) ../bin/$(host)/spread$(EXEEXT)
+	$(INSTALL) -m 644 $(srcdir)/sample.spread.conf ../bin/$(host)/spread.conf
+
 install: $(TARGETS) install-files 
 
 install-files:

Modified: trunk/examples/Makefile.in
===================================================================
--- trunk/examples/Makefile.in	2006-02-08 08:18:04 UTC (rev 287)
+++ trunk/examples/Makefile.in	2006-02-08 08:20:18 UTC (rev 288)
@@ -13,6 +13,7 @@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 buildtoolsdir=$(top_srcdir)/buildtools
+host=@host@
 
 DESTDIR=
 VPATH=@srcdir@
@@ -94,6 +95,13 @@
 distprep: 
 	autoreconf
 
+binrelease: $(TARGETS)
+	$(buildtoolsdir)/mkinstalldirs ../bin/$(host)
+	$(INSTALL) -m 0755 -s spuser$(EXEEXT) ../bin/$(host)/spuser$(EXEEXT)
+	$(INSTALL) -m 0755 -s sptuser$(EXEEXT) ../bin/$(host)/sptuser$(EXEEXT)
+	$(INSTALL) -m 0755 -s spflooder$(EXEEXT) ../bin/$(host)/spflooder$(EXEEXT)
+	$(INSTALL) -m 0755 -s flush_user$(EXEEXT) ../bin/$(host)/flush_user$(EXEEXT)
+
 install: $(TARGETS) install-files
 
 install-files:

Modified: trunk/libspread/Makefile.in
===================================================================
--- trunk/libspread/Makefile.in	2006-02-08 08:18:04 UTC (rev 287)
+++ trunk/libspread/Makefile.in	2006-02-08 08:20:18 UTC (rev 288)
@@ -13,6 +13,7 @@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 buildtoolsdir=$(top_srcdir)/buildtools
+host=@host@
 
 DESTDIR=
 VPATH=@srcdir@ $(top_srcdir)/daemon
@@ -169,6 +170,22 @@
 distclean: clean
 	rm -f Makefile config.status *~
 
+binrelease: $(TARGETS)
+	$(buildtoolsdir)/mkinstalldirs ../lib/$(host)
+	$(INSTALL) -m 644 libspread.a ../lib/$(host)/libspread.a
+	$(INSTALL) -m 644 libspread-core.a ../lib/$(host)/libspread-core.a
+	$(INSTALL) -m 644 libtspread-core.a ../lib/$(host)/libtspread-core.a
+ifeq (@LIBSPSO@, libspread.so)
+	  $(INSTALL) -m 755 libspread.so ../lib/$(host)/libspread.so.$(LIBVERSION)
+	  $(INSTALL) -m 755 libspread-core.so ../lib/$(host)/libspread-core.so.$(LIBVERSION)
+	  $(INSTALL) -m 755 libtspread-core.so ../lib/$(host)/libtspread-core.so.$(LIBVERSION)
+endif
+ifeq (@LIBSPSO@, libspread.dylib)
+	  $(INSTALL) -m 755 libspread.$(LIBVERSION).dylib ../lib/$(host)/libspread.$(LIBVERSION).dylib
+	  $(INSTALL) -m 755 libspread-core.$(LIBVERSION).dylib ../lib/$(host)/libspread-core.$(LIBVERSION).dylib
+	  $(INSTALL) -m 755 libtspread-core.$(LIBVERSION).dylib ../lib/$(host)/libtspread-core.$(LIBVERSION).dylib
+endif
+
 install: $(TARGETS) install-files install-@LIBSPSO@ install-@LIBSPCORESO@ install-@LIBTSPCORESO@
 
 install-files:
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.