3 files changed, 37 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e3a17f723..888cbabf1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if HAVE_POSTGRESQL
   PQ_DIR = pq
 endif
-SUBDIRS = include util $(PQ_DIR) mintdb mint mint-tools 
+if WALLET_ONLY
+SUBDIRS = include util
+else
+
+SUBDIRS = include util $(PQ_DIR) mintdb mint mint-tools
 if HAVE_LIBCURL
  SUBDIRS += mint-lib
 endif
+
+endif
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 5bb4cfa20..9c3ee9071 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,6 +1,15 @@
 # This Makefile.am is in the public domain
 talerincludedir = $(includedir)/taler
 
+if WALLET_ONLY
+talerinclude_HEADERS = \
+  platform.h \
+  taler_amount_lib.h \
+  taler_crypto_lib.h \
+  taler_util_wallet.h
+
+else
+
 talerinclude_HEADERS = \
   platform.h \
   taler_amount_lib.h \
@@ -12,3 +21,5 @@ talerinclude_HEADERS = \
   taler_mintdb_plugin.h \
   taler_pq_lib.h \
   taler_signatures.h
+
+endif
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 804ff85a2..0c44570ed 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -6,8 +6,27 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+if WALLET_ONLY
+lib_LTLIBRARIES = \
+  libtalerutil_wallet.la
+else
 lib_LTLIBRARIES = \
   libtalerutil.la
+endif
+
+libtalerutil_wallet_la_SOURCES = \
+  amount.c \
+  crypto.c \
+  util.c
+
+libtalerutil_wallet_la_LIBADD = \
+  -lgnunetutil_taler_wallet \
+  $(LIBGCRYPT_LIBS) \
+  $(XLIB)
+
+libtalerutil_wallet_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -export-dynamic -no-undefined
 
 libtalerutil_la_SOURCES = \
   amount.c \