Patches 04-14

[email protected] Fri, 23 Feb 2007 23:05:15 -0600

Newsgroups	gmane.comp.gnu.gift.general
Message-ID	<[email protected]>

the following patches are to make gift build in a builddir.
they do not change things from working "as normally, they just allow the following workflow:

cd $GIFTSRCDIR
mkdir build
cd build
../configure
make
make install

AKA, build somewhere other than the sourcedir root, so as to not clutter up the root (amongst other things..)

commited.

Julia Longtin <[email protected]>

_______________________________________________
help-GIFT mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/help-gift

04-ChangeLog (text/plain, 505 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 12:27:56.000000000 -0600
+++ ChangeLog	2006-11-18 12:30:56.000000000 -0600
@@ -11,6 +11,8 @@
 	* libMRML/cc/CAttributeList.cc
 	include wordsize.h, so we can tell if we're a 64 or 32bit binary during build.
 	when dumping pointer as int, check the size of the pointer before casting.
+	* FeatureExtraction/Makefile.am
+	change $(top_srcdir) to $(top_builddir), so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

04-FeatureExtraction_Makefile_am-make_build_in_subdir.patch (text/plain, 638 B)

--- ../../dev/gift/FeatureExtraction/Makefile.am	2006-01-10 02:53:02.000000000 -0600
+++ FeatureExtraction/Makefile.am	2006-11-06 04:54:19.000000000 -0600
@@ -28,9 +28,9 @@
 
 gift_write_feature_descs_SOURCES= $(david_sources) write_feature_descs.c
 
-gift_extract_features_LDADD =  -L$(top_srcdir)/libSquirePPM -lSquirePPM -lm 
+gift_extract_features_LDADD =  -L$(top_builddir)/libSquirePPM -lSquirePPM -lm 
 
-gift_write_feature_descs_LDADD= -L$(top_srcdir)/libSquirePPM -lSquirePPM -lm 
+gift_write_feature_descs_LDADD= -L$(top_builddir)/libSquirePPM -lSquirePPM -lm 
 
 
 bin_PROGRAMS = gift-extract-features gift-write-feature-descs

05-ChangeLog (text/plain, 764 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 12:32:29.000000000 -0600
+++ ChangeLog	2006-11-18 12:53:08.000000000 -0600
@@ -13,6 +13,10 @@
 	when dumping pointer as int, check the size of the pointer before casting.
 	* FeatureExtraction/Makefile.am
 	change $(top_srcdir) to $(top_builddir), so that we can build gift in a directory other than ${srcdir}
+	* GIFTServer/Makefile.am
+	remove $(srcdir), not being used.
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	NOTE: in reality, before the "libraries" can be moved into being seperately installable packages, these paths need changed to <directory/target.h>
 
 2006-10-10    <[email protected]>

05-GIFTServer_Makefile_am-make_build_in_subdir.patch (text/plain, 572 B)

--- ../../dev3/gift/GIFTServer/Makefile.am	2003-04-22 03:03:46.000000000 -0500
+++ GIFTServer/Makefile.am	2006-11-18 12:49:25.000000000 -0600
@@ -16,7 +16,7 @@
 
 # include directories for all programs in this dir
 
-INCLUDES = -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(srcdir)   -I.
+INCLUDES = -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir) -I.
 
 #-------------------------------------------------

06-ChangeLog (text/plain, 723 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:04:43.000000000 -0600
+++ ChangeLog	2006-11-18 13:09:45.000000000 -0600
@@ -17,6 +17,8 @@
 	remove $(srcdir), not being used.
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	NOTE: in reality, before the "libraries" can be moved into being seperately installable packages, these paths need changed to <directory/target.h>
+	* libGIFTAcDistanceMatrix/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

06-libGIFTAcDistanceMatrix_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 935 B)

--- ../../dev/gift/libGIFTAcDistanceMatrix/cc/Makefile.am	2006-02-28 07:48:22.000000000 -0600
+++ libGIFTAcDistanceMatrix/cc/Makefile.am	2006-11-06 04:12:22.000000000 -0600
@@ -25,7 +25,7 @@
 
 libGIFTAcDistanceMatrix_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML ../../libGIFTAcInvertedFile/cc/.libs/libGIFTAcInvertedFile.a 
 
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/libGIFTAcDistanceMatrix/include -I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir)/libGIFTQuBayesian/include -I$(HOME)/browsing/libGIFTQuBayesian/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/libGIFTAcDistanceMatrix/include -I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir)/libGIFTQuBayesian/include -I$(top_srcdir) -I$(HOME)/browsing/libGIFTQuBayesian/include
 
 
 libGIFTAcDistanceMatrix_la_SOURCES= \

07-ChangeLog (text/plain, 725 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:11:06.000000000 -0600
+++ ChangeLog	2006-11-18 13:14:38.000000000 -0600
@@ -19,6 +19,8 @@
 	NOTE: in reality, before the "libraries" can be moved into being seperately installable packages, these paths need changed to <directory/target.h>
 	* libGIFTAcDistanceMatrix/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTAcHierarchy/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

07-libGIFTAcHierarchy_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 618 B)

--- ../../dev/gift/libGIFTAcHierarchy/cc/Makefile.am	2004-12-03 15:15:19.000000000 +0100
+++ libGIFTAcHierarchy/cc/Makefile.am	2006-11-01 04:24:01.000000000 +0100
@@ -30,7 +30,7 @@
 
 libGIFTAcHierarchy_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML 
 
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcHierarchy/include -I$(top_srcdir)/expat/xmlparse -I$(top_srcdir)/expat/xmltok 
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcHierarchy/include -I$(top_srcdir)/expat/xmlparse -I$(top_srcdir)/expat/xmltok -I$(top_srcdir)/
 
 
 libGIFTAcHierarchy_la_SOURCES= \

08-ChangeLog (text/plain, 734 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:16:38.000000000 -0600
+++ ChangeLog	2006-11-18 13:23:28.000000000 -0600
@@ -21,6 +21,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTAcHierarchy/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTAcInvertedFile/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

08-libGIFTAcInvertedFile_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 665 B)

--- ../../dev3/gift/libGIFTAcInvertedFile/cc/Makefile.am	2006-02-28 07:48:22.000000000 -0600
+++ libGIFTAcInvertedFile/cc/Makefile.am	2006-11-18 13:17:51.000000000 -0600
@@ -27,7 +27,7 @@
 
 libGIFTAcInvertedFile_la_LDFLAGS= -module "@PRE_INSTALL_LIBDIRS@" -lMRML ../../libGIFTAcURL2FTS/cc/.libs/libGIFTAcURL2FTS.a
 
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/libGIFTAcURL2FTS/include 
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir)
 
 
 #CAcIFFileSystem.cc: CAcIFFileSystem.pre-cc

09-ChangeLog (text/plain, 729 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:29:01.000000000 -0600
+++ ChangeLog	2006-11-18 13:28:54.000000000 -0600
@@ -23,6 +23,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTAcInvertedFile/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTAcPerl/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

09-libGIFTAcPerl_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 540 B)

--- /disk1/gift/src/merge/dev2/gift/libGIFTAcPerl/cc/Makefile.am	2002-02-26 14:20:18.000000000 +0100
+++ libGIFTAcPerl/cc/Makefile.am	2006-11-01 20:51:29.000000000 +0100
@@ -25,7 +25,7 @@
 
 libGIFTAcPerl_la_LDFLAGS=@PRE_INSTALL_LIBDIRS@ --rpath../../libMRML/cc/.libs/ -lMRML 
 
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcPerl/include 
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcPerl/include -I$(top_srcdir)
 
 # libGIFTAcPerl_a_SOURCES= 
 libGIFTAcPerl_la_SOURCES= \

10-ChangeLog (text/plain, 724 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:30:38.000000000 -0600
+++ ChangeLog	2006-11-18 13:32:10.000000000 -0600
@@ -25,6 +25,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTAcPerl/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTAcURL2FTS/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

10-libGIFTAcURL2FTS_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 531 B)

--- ../../dev3/gift/libGIFTAcURL2FTS/cc/Makefile.am	2002-02-26 07:20:18.000000000 -0600
+++ libGIFTAcURL2FTS/cc/Makefile.am	2006-11-18 13:31:34.000000000 -0600
@@ -25,7 +25,7 @@
 
 libGIFTAcURL2FTS_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML 
 INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcURL2FTS/include \
-	-I$(top_srcdir)/expat/xmlparse -I$(top_srcdir)/expat/xmltok 
+	-I$(top_srcdir)/expat/xmlparse -I$(top_srcdir)/expat/xmltok -I$(top_srcdir)/
 
 libGIFTAcURL2FTS_la_SOURCES= \
 	CAcURL2FTS.cc\

11-ChangeLog (text/plain, 729 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:45:38.000000000 -0600
+++ ChangeLog	2006-11-18 13:45:32.000000000 -0600
@@ -27,6 +27,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTAcURL2FTS/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTQuHierarchy/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

11-libGIFTQuHierarchy_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 624 B)

--- ../../dev3/gift/libGIFTQuHierarchy/cc/Makefile.am	2004-12-03 08:15:20.000000000 -0600
+++ libGIFTQuHierarchy/cc/Makefile.am	2006-11-18 13:44:52.000000000 -0600
@@ -28,6 +28,6 @@
 
 libGIFTQuHierarchy_la_LDFLAGS=@PRE_INSTALL_LIBDIRS@ -lMRML -lGIFTAcHierarchy
 
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcHierarchy/include -I$(top_srcdir)/libGIFTQuHierarchy/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcHierarchy/include -I$(top_srcdir)/libGIFTQuHierarchy/include -I$(top_srcdir)/
 
 libGIFTQuHierarchy_la_SOURCES= CQHierarchy.cc plug_in_fo.cc

12-ChangeLog (text/plain, 734 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 13:56:43.000000000 -0600
+++ ChangeLog	2006-11-18 13:56:26.000000000 -0600
@@ -29,6 +29,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTQuHierarchy/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTQuInvertedFile/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

12-libGIFTQuInvertedFile_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 668 B)

--- /disk1/gift/src/merge/dev2/gift/libGIFTQuInvertedFile/cc/Makefile.am	2006-02-28 14:48:22.000000000 +0100
+++ libGIFTQuInvertedFile/cc/Makefile.am	2006-11-01 20:41:28.000000000 +0100
@@ -29,7 +29,7 @@
 #
 # The trick here is: do not compile c code with the -D bool=char define.
 #-rdynamic
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTQuInvertedFile/include -I$(top_srcdir)/libGIFTAcInvertedFile/include 
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTQuInvertedFile/include -I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/
 
 libGIFTQuInvertedFile_la_SOURCES= \
 	CWeightingFunction.cc \

13-ChangeLog (text/plain, 729 B)

--- ../../dev3/gift/ChangeLog	2006-11-18 14:00:15.000000000 -0600
+++ ChangeLog	2006-11-18 14:00:07.000000000 -0600
@@ -31,6 +31,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTQuInvertedFile/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libGIFTQuPerl/cc/Makefile.am
+	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 
 2006-10-10    <[email protected]>

13-libGIFTQuPerl_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 572 B)

--- ../../dev3/gift/libGIFTQuPerl/cc/Makefile.am	2002-02-26 07:20:19.000000000 -0600
+++ libGIFTQuPerl/cc/Makefile.am	2006-11-18 13:59:16.000000000 -0600
@@ -27,7 +27,7 @@
 #
 # The trick here is: do not compile c code with the -D bool=char define.
 #-rdynamic
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcPerl/include -I$(top_srcdir)/libGIFTQuPerl/include 
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include -I$(top_srcdir)/libGIFTAcPerl/include -I$(top_srcdir)/libGIFTQuPerl/include -I$(top_srcdir)/
 
 
 libGIFTQuPerl_la_SOURCES= \

14-ChangeLog (text/plain, 603 B)

--- ../../dev3/gift/ChangeLog	2006-11-19 10:37:15.000000000 -0600
+++ ChangeLog	2006-11-19 10:48:54.000000000 -0600
@@ -33,6 +33,8 @@
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
 	* libGIFTQuPerl/cc/Makefile.am
 	HACK: add $(top_srcdir) to the path, to fix #includes of the form "directory/include/target.h", so that we can build gift in a directory other than ${srcdir}
+	* libMRML/cc/Makefile.am
+	use $(srcdir)/ to find libMRML-config.pre-cc.
 
 2006-10-10    <[email protected]>

14-libMRML_cc_Makefile_am-make_build_in_subdir.patch (text/plain, 508 B)

--- ../../dev3/gift/libMRML/cc/Makefile.am	2006-01-10 02:53:03.000000000 -0600
+++ libMRML/cc/Makefile.am	2006-11-19 10:46:41.000000000 -0600
@@ -114,7 +114,7 @@
                 s§%LDFLAGS%§$(LDFLAGS)§g;\
                 s§%LIBS%§$(LIBS)§ g;\
                 s§%GIFT_MYSQL_DIR%§@GIFT_MYSQL_DIR@§g;\
-	        s§%libdir%§$(libdir)§g;"  < libMRML-config.pre-cc  > libMRML-config.cc
+	        s§%libdir%§$(libdir)§g;"  < $(srcdir)/libMRML-config.pre-cc  > libMRML-config.cc
 
 bin_PROGRAMS= libMRML-config