]>
Commit | Line | Data |
---|---|---|
014dea7e JB |
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 = \ | |
2447d823 JB |
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 | ||
014dea7e | 15 | @@ -52,7 +49,10 @@ libdwi_db_odbc_la_CFLAGS = \ |
2447d823 JB |
16 | ${ODBC_CFLAGS} |
17 | ||
18 | libdwi_db_odbc_la_LDFLAGS = \ | |
19 | - -module \ | |
014dea7e JB |
20 | + -module -avoid-version |
21 | + | |
22 | +libdwi_db_odbc_la_LIBADD = \ | |
23 | + $(GLIB_LIBS) \ | |
2447d823 JB |
24 | ${ODBC_LIBS} |
25 | ||
26 | #------------------------------------- | |
014dea7e JB |
27 | @@ -65,7 +65,10 @@ libdwi_db_libpg_la_CFLAGS = \ |
28 | `pkg-config --cflags glib-2.0` | |
2447d823 JB |
29 | |
30 | libdwi_db_libpg_la_LDFLAGS = \ | |
014dea7e JB |
31 | - -module \ |
32 | + -module -avoid-version | |
33 | + | |
34 | +libdwi_db_libpg_la_LIBADD = \ | |
35 | + $(GLIB_LIBS) \ | |
36 | ${PQ_LIBS} | |
2447d823 JB |
37 | |
38 | #------------------------------------- | |
014dea7e JB |
39 | @@ -78,7 +81,10 @@ libdwi_db_libdbi_la_CFLAGS = \ |
40 | `pkg-config --cflags glib-2.0` | |
2447d823 JB |
41 | |
42 | libdwi_db_libdbi_la_LDFLAGS = \ | |
014dea7e JB |
43 | - -module \ |
44 | + -module -avoid-version | |
45 | + | |
46 | +libdwi_db_libdbi_la_LIBADD = \ | |
47 | + $(GLIB_LIBS) \ | |
48 | ${DBI_LIBS} | |
2447d823 JB |
49 | |
50 | #------------------------------------- | |
014dea7e JB |
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-08 14:34:41.030928127 +0200 | |
53 | @@ -41,7 +41,6 @@ noinst_HEADERS = \ | |
54 | ||
2447d823 | 55 | |
014dea7e JB |
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 | --- dwi-0.6.2/src/Makefile.am.orig 2007-06-13 19:50:17.000000000 +0200 | |
62 | +++ dwi-0.6.2/src/Makefile.am 2007-09-08 14:35:16.308938506 +0200 | |
63 | @@ -65,8 +65,7 @@ noinst_HEADERS = \ | |
64 | util.h | |
65 | ||
66 | libdwi_la_LDFLAGS = \ | |
2447d823 JB |
67 | - -module \ |
68 | `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0` | |
69 | ||
70 | -libdwi_la_LIBADD = | |
014dea7e JB |
71 | - |
72 | +libdwi_la_LIBADD = \ | |
73 | + ../db_drivers/libdwi-dbdrivers.la | |
74 | --- dwi-0.6.2/app/Makefile.am.orig 2007-06-13 20:36:44.000000000 +0200 | |
75 | +++ dwi-0.6.2/app/Makefile.am 2007-09-08 14:33:46.683831062 +0200 | |
76 | @@ -34,7 +34,6 @@ dwiinclude_HEADERS = \ | |
2447d823 JB |
77 | readfile.h |
78 | ||
79 | libdwi_parse_la_LDFLAGS = \ | |
80 | - -module \ | |
81 | `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0` | |
82 | ||
014dea7e JB |
83 | libdwi_parse_la_LIBADD = |
84 | @@ -56,13 +55,17 @@ dwi_run_CFLAGS = \ | |
85 | `pkg-config --cflags libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0` | |
2447d823 | 86 | |
014dea7e JB |
87 | dwi_run_LDFLAGS = \ |
88 | - ${QOF_LIBS} \ | |
89 | - ${ODBC_LIBS} \ | |
2447d823 JB |
90 | `pkg-config --libs libxml-2.0 glib-2.0 gobject-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0` |
91 | ||
92 | +if BUILD_QOF | |
014dea7e | 93 | +DWIQOF = ../dwi-qof/libdwi-qof.la |
2447d823 JB |
94 | +endif |
95 | + | |
96 | dwi_run_LDADD = \ | |
97 | libdwi-parse.la \ | |
98 | ../src/libdwi.la \ | |
99 | ../dwi-gtk/libdwi-gtk.la \ | |
100 | - ../dwi-qof/libdwi-qof.la \ | |
014dea7e | 101 | - ../db_drivers/libdwi-dbdrivers.la |
2447d823 | 102 | + $(DWIQOF) \ |
014dea7e JB |
103 | + ../db_drivers/libdwi-dbdrivers.la \ |
104 | + ${QOF_LIBS} \ | |
105 | + ${ODBC_LIBS} |