donau

commit ad8ed9efd8fd833942b070cc7495eef1cb419560
parent 5048236516c7c5008a02162213f16f6957fc5dab
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
Date:   Mon, 15 Jan 2024 15:20:07 +0100

fix talerpq link error

Diffstat:
M
src/Makefile.am
 | 
5
+----
M
src/donau/Makefile.am
 | 
1
+
M
src/donaudb/Makefile.am
 | 
1
+
M
src/pq/Makefile.am
 | 
40
++++++++++++++++++++--------------------

4 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,8 +1,5 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-if HAVE_POSTGRESQL
-  PQ_DIR = pq
-endif
 
 # pkgcfgdir = $(prefix)/share/taler/config.d/
 # pkgcfg_DATA = \
@@ -15,7 +12,7 @@ SUBDIRS = \
   include \
   util \
   json \
-  $(PQ_DIR) \
+  pq \
   donaudb \
   donau \
   lib \
diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am
@@ -23,6 +23,7 @@ donau_httpd_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/donaudb/libdonaudb.la \
   $(top_builddir)/src/util/libdonauutil.la \
+  $(top_builddir)/src/pq/libdonaupq.la \
   -lmicrohttpd \
   -ltalermhd   \
   -ltalerutil  \
diff --git a/src/donaudb/Makefile.am b/src/donaudb/Makefile.am
@@ -95,6 +95,7 @@ libtaler_plugin_donaudb_postgres_la_SOURCES = \
 libtaler_plugin_donaudb_postgres_la_LIBADD = \
   $(LTLIBINTL) \
   $(top_builddir)/src/util/libdonauutil.la \
+  $(top_builddir)/src/pq/libdonaupq.la \
   -ltalerpq \
   -ltalerutil \
   -lgnunetpq \
diff --git a/src/pq/Makefile.am b/src/pq/Makefile.am
@@ -7,35 +7,35 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libtalerpq.la
+  libdonaupq.la
 
-libtalerpq_la_SOURCES = \
+libdonaupq_la_SOURCES = \
   pq_query_helper.c \
   pq_result_helper.c
-libtalerpq_la_LIBADD = \
+libdonaupq_la_LIBADD = \
   $(top_builddir)/src/util/libdonauutil.la  \
   -lgnunetutil -ljansson \
   -lgnunetpq \
   -lpq \
   $(XLIB)
-libtalerpq_la_LDFLAGS = \
+libdonaupq_la_LDFLAGS = \
   $(POSTGRESQL_LDFLAGS) \
   -version-info 0:0:0 \
   -no-undefined
 
-check_PROGRAMS= \
- test_pq
-
-TESTS = \
- $(check_PROGRAMS)
-
-test_pq_SOURCES = \
-  test_pq.c
-test_pq_LDADD = \
-  libtalerpq.la \
-  $(top_builddir)/src/util/libdonauutil.la  \
-  -lgnunetpq \
-  -lgnunetutil \
-  -ljansson \
-  -lpq \
-  $(XLIB)
+#check_PROGRAMS= \
+# test_pq
+#
+#TESTS = \
+# $(check_PROGRAMS)
+#
+#test_pq_SOURCES = \
+#  test_pq.c
+#test_pq_LDADD = \
+#  libdonaupq.la \
+#  $(top_builddir)/src/util/libdonauutil.la  \
+#  -lgnunetpq \
+#  -lgnunetutil \
+#  -ljansson \
+#  -lpq \
+#  $(XLIB)