dwi-link.patch

   1 --- dwi-0.6.2/db_drivers/Makefile.am.orig       2007-06-13 19:12:50.000000000 +0200
   2 +++ dwi-0.6.2/db_drivers/Makefile.am    2007-09-08 14:20:03.080896606 +0200
   3 @@ -36,10 +36,7 @@ AM_CFLAGS = \
   4  libdwi_dbdrivers_la_SOURCES = \
   5         dui-initdb.c
   6
   7 -libdwi_dbdrivers_la_LDFLAGS = \
   8 -       -module
   9 -
  10 -libdwi_dbdrivers_la_LIBADD =
  11 +libdwi_dbdrivers_la_LIBADD = $(GLIB_LIBS) -ldl
  12
  13  #-------------------------------------
  14
  15 @@ -52,7 +49,10 @@ libdwi_db_odbc_la_CFLAGS = \
  16         ${ODBC_CFLAGS}
  17
  18  libdwi_db_odbc_la_LDFLAGS = \
  19 -       -module \
  20 +       -module -avoid-version
  21 +
  22 +libdwi_db_odbc_la_LIBADD = \
  23 +       $(GLIB_LIBS) \
  24         ${ODBC_LIBS}
  25
  26  #-------------------------------------
  27 @@ -65,7 +65,10 @@ libdwi_db_libpg_la_CFLAGS = \
  28         `pkg-config --cflags glib-2.0`
  29
  30  libdwi_db_libpg_la_LDFLAGS = \
  31 -       -module \
  32 +       -module -avoid-version
  33 +
  34 +libdwi_db_libpg_la_LIBADD = \
  35 +       $(GLIB_LIBS) \
  36         ${PQ_LIBS}
  37
  38  #-------------------------------------
  39 @@ -78,7 +81,10 @@ libdwi_db_libdbi_la_CFLAGS = \
  40         `pkg-config --cflags glib-2.0`
  41
  42  libdwi_db_libdbi_la_LDFLAGS = \
  43 -       -module \
  44 +       -module -avoid-version
  45 +
  46 +libdwi_db_libdbi_la_LIBADD = \
  47 +       $(GLIB_LIBS) \
  48         ${DBI_LIBS}
  49
  50  #-------------------------------------
  51 --- dwi-0.6.2/dwi-gtk/Makefile.am.orig  2007-06-13 19:48:28.000000000 +0200
  52 +++ dwi-0.6.2/dwi-gtk/Makefile.am       2007-09-15 02:12:23.243090038 +0200
  53 @@ -41,8 +41,14 @@ noinst_HEADERS = \
  54
  55
  56  libdwi_gtk_la_LDFLAGS = \
  57 -       -module \
  58         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0`
  59
  60 -libdwi_gtk_la_LIBADD =
  61 +libdwi_gtk_la_LIBADD = \
  62 +       ../app/libdwi-parse.la \
  63 +       ../src/libdwi.la
  64
  65 +../app/libdwi-parse.la:
  66 +       $(MAKE) -C ../app libdwi-parse.la
  67 +
  68 +install-exec-local:
  69 +       $(MAKE) -C ../app install-libLTLIBRARIES
  70 --- dwi-0.6.2/src/Makefile.am.orig      2007-06-13 19:50:17.000000000 +0200
  71 +++ dwi-0.6.2/src/Makefile.am   2007-09-08 14:35:16.308938506 +0200
  72 @@ -65,8 +65,7 @@ noinst_HEADERS = \
  73         util.h
  74
  75  libdwi_la_LDFLAGS = \
  76 -       -module \
  77         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0`
  78
  79 -libdwi_la_LIBADD =
  80 -
  81 +libdwi_la_LIBADD = \
  82 +       ../db_drivers/libdwi-dbdrivers.la
  83 --- dwi-0.6.2/app/Makefile.am.orig      2007-06-13 20:36:44.000000000 +0200
  84 +++ dwi-0.6.2/app/Makefile.am   2007-09-15 00:36:18.893399519 +0200
  85 @@ -34,10 +34,9 @@ dwiinclude_HEADERS =   \
  86         readfile.h
  87
  88  libdwi_parse_la_LDFLAGS = \
  89 -       -module \
  90         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0`
  91
  92 -libdwi_parse_la_LIBADD =
  93 +libdwi_parse_la_LIBADD = ../src/libdwi.la
  94
  95
  96  # ---------------------------------
  97 @@ -51,18 +50,15 @@ dwi_run_SOURCES = \
  98  dwi_run_CFLAGS = \
  99         -I ../src \
 100         -I ../dwi-gtk \
 101 -       ${QOF_CFLAGS} \
 102         ${ODBC_CFLAGS} \
 103         `pkg-config --cflags libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0`
 104
 105  dwi_run_LDFLAGS = \
 106 -       ${QOF_LIBS} \
 107 -       ${ODBC_LIBS} \
 108         `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0`
 109
 110  dwi_run_LDADD = \
 111         libdwi-parse.la \
 112         ../src/libdwi.la \
 113         ../dwi-gtk/libdwi-gtk.la \
 114 -       ../dwi-qof/libdwi-qof.la \
 115 -       ../db_drivers/libdwi-dbdrivers.la
 116 +       ../db_drivers/libdwi-dbdrivers.la \
 117 +       ${ODBC_LIBS}
 118 --- dwi-0.6.2/dwi-qof/Makefile.am.orig  2007-06-14 18:37:38.000000000 +0200
 119 +++ dwi-0.6.2/dwi-qof/Makefile.am       2007-09-15 00:34:43.440137667 +0200
 120 @@ -34,7 +34,9 @@ dwiinclude_HEADERS = \
 121         parse-qof.h
 122
 123  libdwi_qof_la_LDFLAGS = \
 124 -       -module              \
 125         $(QOF_LIBS)          \
 126         `pkg-config --libs glib-2.0`
 127
 128 +libdwi_qof_la_LIBADD = \
 129 +       ../app/libdwi-parse.la \
 130 +       ../src/libdwi.la
 131 --- dwi-0.6.2/Makefile.am.orig  2007-06-14 20:03:59.000000000 +0200
 132 +++ dwi-0.6.2/Makefile.am       2007-09-15 02:13:32.831476707 +0200
 133 @@ -11,7 +11,7 @@
 134
 135  # Don't build qof subdirectories if QOF not installed
 136
 137 -SUBDIRS = db_drivers dwi dwi-gtk dwi-qof src glade app examples po
 138 +SUBDIRS = db_drivers dwi src dwi-gtk dwi-qof glade app examples po
 139
 140  pkgconfigdir = $(libdir)/pkgconfig
 141  pkgconfig_DATA = dwi-0.pc