summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2015-09-17 14:09:26 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2015-09-17 14:09:26 +0200
commitd9ab393f2d85158e225cd50f85342d5211c40210 (patch)
treed01dd1eb97676026d38fb913ed82f9168ea544b4
parent54b6af788b202f66d74959988cca06b20fedaeba (diff)
downloadmerchant-d9ab393f2d85158e225cd50f85342d5211c40210.tar.gz
merchant-d9ab393f2d85158e225cd50f85342d5211c40210.tar.bz2
merchant-d9ab393f2d85158e225cd50f85342d5211c40210.zip
automake (little) fix
-rw-r--r--src/Makefile.am2
-rw-r--r--src/backend/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bebdae8c..89a2120f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,2 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include backend backend-lib
+SUBDIRS = include backend-lib backend
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index c0eacfae..a423c83a 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -1,5 +1,5 @@
# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend-lib/
bin_PROGRAMS = \
taler-merchant-httpd
@@ -18,7 +18,7 @@ taler_merchant_httpd_LDADD = \
-lmicrohttpd \
-ljansson \
-lgnunetutil \
- -ltalermerchant \
+ $(top_srcdir)/src/backend-lib/libtalermerchant.la \
-ltalermint \
-ltalerpq \
-lgnunetpostgres \