SOURCES: dwi-link.patch (NEW) - linking fixes

[qboosh]

Author: qboosh                       Date: Wed Feb 22 12:50:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- linking fixes

---- Files affected:
SOURCES:
   dwi-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/dwi-link.patch
diff -u /dev/null SOURCES/dwi-link.patch:1.1
--- /dev/null	Wed Feb 22 13:50:03 2006
+++ SOURCES/dwi-link.patch	Wed Feb 22 13:49:58 2006
@@ -0,0 +1,128 @@
+--- dwi-0.6.1/db_drivers/Makefile.am.orig	2004-07-29 15:49:51.000000000 +0200
++++ dwi-0.6.1/db_drivers/Makefile.am	2006-02-22 12:28:24.000000000 +0100
+@@ -31,15 +31,12 @@
+ 
+ AM_CFLAGS = \
+ 	-I${top_srcdir}/src \
+-	`glib-config --cflags` 
++	$(GLIB_CFLAGS)
+ 
+ libdwi_dbdrivers_la_SOURCES = \
+ 	dui-initdb.c 
+ 
+-libdwi_dbdrivers_la_LDFLAGS = \
+-	-module 
+-
+-libdwi_dbdrivers_la_LIBADD = 
++libdwi_dbdrivers_la_LIBADD = $(GLIB_LIBS) -ldl
+ 
+ #-------------------------------------
+ 
+@@ -48,11 +45,11 @@
+ 
+ libdwi_db_odbc_la_CFLAGS = \
+ 	-I${top_srcdir}/src \
+-	`glib-config --cflags`  \
++	$(GLIB_CFLAGS) \
+ 	${ODBC_CFLAGS}
+ 
+ libdwi_db_odbc_la_LDFLAGS = \
+-	-module \
++	-module -avoid-version $(GLIB_LIBS) \
+ 	${ODBC_LIBS}
+ 
+ #-------------------------------------
+@@ -62,10 +59,10 @@
+ 
+ libdwi_db_libpg_la_CFLAGS = \
+ 	-I${top_srcdir}/src \
+-	`glib-config --cflags`  
++	$(GLIB_CFLAGS)
+ 
+ libdwi_db_libpg_la_LDFLAGS = \
+-	-module -lpq
++	-module -avoid-version $(GLIB_LIBS) -lpq
+ 
+ #-------------------------------------
+ 
+@@ -74,10 +71,10 @@
+ 
+ libdwi_db_libdbi_la_CFLAGS = \
+ 	-I${top_srcdir}/src \
+-	`glib-config --cflags`  
++	$(GLIB_CFLAGS)
+ 
+ libdwi_db_libdbi_la_LDFLAGS = \
+-	-module -ldbi
++	-module -avoid-version $(GLIB_LIBS) -ldbi
+ 
+ #-------------------------------------
+ 
+--- dwi-0.6.1/src/Makefile.am.orig	2006-02-21 12:37:57.000000000 +0100
++++ dwi-0.6.1/src/Makefile.am	2006-02-22 11:49:36.000000000 +0100
+@@ -68,5 +68,4 @@
+-	-module \
+ 	`pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0` 
+ 
+-libdwi_la_LIBADD = 
++libdwi_la_LIBADD = ../db_drivers/libdwi-dbdrivers.la
+ 
+--- dwi-0.6.1/app/Makefile.am.orig	2006-02-22 12:15:42.000000000 +0100
++++ dwi-0.6.1/app/Makefile.am	2006-02-22 12:17:10.000000000 +0100
+@@ -34,10 +34,9 @@
+ 	readfile.h
+ 
+ libdwi_parse_la_LDFLAGS = \
+-	-module \
+ 	`pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0` 
+ 
+-libdwi_parse_la_LIBADD = 
++libdwi_parse_la_LIBADD = ../src/libdwi.la
+ 
+ 
+ # ---------------------------------
+@@ -60,9 +59,15 @@
+ 	${ODBC_LIBS} \
+ 	`pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0` 
+ 
++if BUILD_QOF
++DWIQOF=../dwi-qof/libdwi-qof.la
++else
++DWIQOF=
++endif
++
+ dwi_run_LDADD = \
+ 	libdwi-parse.la \
+ 	../src/libdwi.la \
+ 	../dwi-gtk/libdwi-gtk.la \
+-	../dwi-qof/libdwi-qof.la \
++	$(DWIQOF) \
+ 	../db_drivers/libdwi-dbdrivers.la
+--- dwi-0.6.1/dwi-gtk/Makefile.am.orig	2006-02-22 12:49:51.000000000 +0100
++++ dwi-0.6.1/dwi-gtk/Makefile.am	2006-02-22 13:26:57.000000000 +0100
+@@ -41,8 +41,12 @@
+ 
+ 
+ libdwi_gtk_la_LDFLAGS = \
+-	-module \
+ 	`pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0` 
+ 
+-libdwi_gtk_la_LIBADD = 
++libdwi_gtk_la_LIBADD = ../src/libdwi.la ../app/libdwi-parse.la
+ 
++../app/libdwi-parse.la:
++	$(MAKE) -C ../app libdwi-parse.la
++
++install-exec-local:
++	$(MAKE) -C ../app install-libLTLIBRARIES
+--- dwi-0.6.1/Makefile.am.orig	2004-07-22 06:19:51.000000000 +0200
++++ dwi-0.6.1/Makefile.am	2006-02-22 12:45:43.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ # Don't build qof subdirectories if QOF not installed
+ 
+-SUBDIRS = db_drivers dwi dwi-gtk dwi-qof src glade app examples
++SUBDIRS = db_drivers dwi src dwi-qof dwi-gtk glade app examples
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = dwi-0.pc
================================================================