dwi-link.patch

   1 --- dwi-0.6.1/db_drivers/Makefile.am.orig       2004-07-29 15:49:51.000000000 +0200
   2 +++ dwi-0.6.1/db_drivers/Makefile.am    2006-02-22 12:28:24.000000000 +0100
   3 @@ -31,15 +31,12 @@
   4
   5  AM_CFLAGS = \
   6         -I${top_srcdir}/src \
   7 -       `glib-config --cflags`
   8 +       $(GLIB_CFLAGS)
   9
  10  libdwi_dbdrivers_la_SOURCES = \
  11         dui-initdb.c
  12
  13 -libdwi_dbdrivers_la_LDFLAGS = \
  14 -       -module
  15 -
  16 -libdwi_dbdrivers_la_LIBADD =
  17 +libdwi_dbdrivers_la_LIBADD = $(GLIB_LIBS) -ldl
  18
  19  #-------------------------------------
  20
  21 @@ -48,11 +45,11 @@
  22
  23  libdwi_db_odbc_la_CFLAGS = \
  24         -I${top_srcdir}/src \
  25 -       `glib-config --cflags`  \
  26 +       $(GLIB_CFLAGS) \
  27         ${ODBC_CFLAGS}
  28
  29  libdwi_db_odbc_la_LDFLAGS = \
  30 -       -module \
  31 +       -module -avoid-version $(GLIB_LIBS) \
  32         ${ODBC_LIBS}
  33
  34  #-------------------------------------
  35 @@ -62,10 +59,10 @@
  36
  37  libdwi_db_libpg_la_CFLAGS = \
  38         -I${top_srcdir}/src \
  39 -       `glib-config --cflags`
  40 +       $(GLIB_CFLAGS)
  41
  42  libdwi_db_libpg_la_LDFLAGS = \
  43 -       -module -lpq
  44 +       -module -avoid-version $(GLIB_LIBS) -lpq
  45
  46  #-------------------------------------
  47
  48 @@ -74,10 +71,10 @@
  49
  50  libdwi_db_libdbi_la_CFLAGS = \
  51         -I${top_srcdir}/src \
  52 -       `glib-config --cflags`
  53 +       $(GLIB_CFLAGS)
  54
  55  libdwi_db_libdbi_la_LDFLAGS = \
  56 -       -module -ldbi
  57 +       -module -avoid-version $(GLIB_LIBS) -ldbi
  58
  59  #-------------------------------------
  60
  61 --- dwi-0.6.1/src/Makefile.am.orig      2006-02-21 12:37:57.000000000 +0100
  62 +++ dwi-0.6.1/src/Makefile.am   2006-02-22 11:49:36.000000000 +0100
  63 @@ -68,5 +68,4 @@
  64 -       -module \
  65         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0`
  66
  67 -libdwi_la_LIBADD =
  68 +libdwi_la_LIBADD = ../db_drivers/libdwi-dbdrivers.la
  69
  70 --- dwi-0.6.1/app/Makefile.am.orig      2006-02-22 12:15:42.000000000 +0100
  71 +++ dwi-0.6.1/app/Makefile.am   2006-02-22 12:17:10.000000000 +0100
  72 @@ -34,10 +34,9 @@
  73         readfile.h
  74
  75  libdwi_parse_la_LDFLAGS = \
  76 -       -module \
  77         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0`
  78
  79 -libdwi_parse_la_LIBADD =
  80 +libdwi_parse_la_LIBADD = ../src/libdwi.la
  81
  82
  83  # ---------------------------------
  84 @@ -60,9 +59,15 @@
  85         ${ODBC_LIBS} \
  86         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0`
  87
  88 +if BUILD_QOF
  89 +DWIQOF=../dwi-qof/libdwi-qof.la
  90 +else
  91 +DWIQOF=
  92 +endif
  93 +
  94  dwi_run_LDADD = \
  95         libdwi-parse.la \
  96         ../src/libdwi.la \
  97         ../dwi-gtk/libdwi-gtk.la \
  98 -       ../dwi-qof/libdwi-qof.la \
  99 +       $(DWIQOF) \
 100         ../db_drivers/libdwi-dbdrivers.la
 101 --- dwi-0.6.1/dwi-gtk/Makefile.am.orig  2006-02-22 12:49:51.000000000 +0100
 102 +++ dwi-0.6.1/dwi-gtk/Makefile.am       2006-02-22 13:26:57.000000000 +0100
 103 @@ -41,8 +41,12 @@
 104
 105
 106  libdwi_gtk_la_LDFLAGS = \
 107 -       -module \
 108         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0`
 109
 110 -libdwi_gtk_la_LIBADD =
 111 +libdwi_gtk_la_LIBADD = ../src/libdwi.la ../app/libdwi-parse.la
 112
 113 +../app/libdwi-parse.la:
 114 +       $(MAKE) -C ../app libdwi-parse.la
 115 +
 116 +install-exec-local:
 117 +       $(MAKE) -C ../app install-libLTLIBRARIES
 118 --- dwi-0.6.1/Makefile.am.orig  2004-07-22 06:19:51.000000000 +0200
 119 +++ dwi-0.6.1/Makefile.am       2006-02-22 12:45:43.000000000 +0100
 120 @@ -11,7 +11,7 @@
 121
 122  # Don't build qof subdirectories if QOF not installed
 123
 124 -SUBDIRS = db_drivers dwi dwi-gtk dwi-qof src glade app examples
 125 +SUBDIRS = db_drivers dwi src dwi-qof dwi-gtk glade app examples
 126
 127  pkgconfigdir = $(libdir)/pkgconfig
 128  pkgconfig_DATA = dwi-0.pc