commit daf0a95f3a1c7c7e01b2e19843de766f0a4c203d
parent 71fb5c13bfe8dbcdae5eb06cb87115d2d87e7bb0
Author: Pius Loosli <loosp2@bfh.ch>
Date: Mon, 23 Oct 2023 14:13:37 +0200
[build] first cleanup/adaptation
Diffstat:
6 files changed, 98 insertions(+), 79 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
@@ -8,7 +8,7 @@
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of CHARITYABILITY or FITNESS FOR A
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
@@ -33,7 +33,7 @@ dnl (at your option) any later version.
dnl
dnl This program is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl CHARITYABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl General Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public License
diff --git a/configure.ac b/configure.ac
@@ -511,31 +511,40 @@ AM_CONDITIONAL([HAVE_TWISTER], [false])
# end of 'doc_only'
])
-AC_CONFIG_FILES([Makefile
+# AC_CONFIG_FILES([Makefile
contrib/Makefile
doc/Makefile
doc/doxygen/Makefile
po/Makefile.in
src/Makefile
- src/auditor/Makefile
- src/auditordb/Makefile
- src/bank-lib/Makefile
- src/curl/Makefile
+ # src/curl/Makefile
src/donau/Makefile
src/donaudb/Makefile
src/donau-tools/Makefile
- src/extensions/Makefile
- src/extensions/age_restriction/Makefile
+ # src/extensions/Makefile
src/lib/Makefile
- src/kyclogic/Makefile
src/testing/Makefile
- src/benchmark/Makefile
+ # src/benchmark/Makefile
src/include/Makefile
- src/json/Makefile
- src/mhd/Makefile
- src/pq/Makefile
- src/sq/Makefile
+ # src/json/Makefile
+ # src/mhd/Makefile
+ # src/pq/Makefile
+ # src/sq/Makefile
src/templating/Makefile
src/util/Makefile
])
+AC_CONFIG_FILES([Makefile
+ contrib/Makefile
+ doc/Makefile
+ doc/doxygen/Makefile
+ po/Makefile.in
+ src/Makefile
+ src/donau/Makefile
+ src/donaudb/Makefile
+ src/donau-tools/Makefile
+ src/lib/Makefile
+ src/testing/Makefile
+ src/include/Makefile
+ src/util/Makefile
+ ])
AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -10,65 +10,65 @@ man_MANS = \
prebuilt/man/taler.conf.5 \
prebuilt/man/taler-config.1 \
prebuilt/man/taler-aggregator-benchmark.1 \
- prebuilt/man/taler-auditor.1 \
- prebuilt/man/taler-auditor-dbinit.1 \
- prebuilt/man/taler-auditor-donau.1 \
- prebuilt/man/taler-auditor-httpd.1 \
- prebuilt/man/taler-auditor-offline.1 \
- prebuilt/man/taler-auditor-sign.1 \
- prebuilt/man/taler-auditor-sync.1 \
- prebuilt/man/taler-bank-benchmark.1 \
- prebuilt/man/taler-bank-transfer.1 \
+ # prebuilt/man/taler-auditor.1 \
+ # prebuilt/man/taler-auditor-dbinit.1 \
+ # prebuilt/man/taler-auditor-donau.1 \
+ # prebuilt/man/taler-auditor-httpd.1 \
+ # prebuilt/man/taler-auditor-offline.1 \
+ #prebuilt/man/taler-auditor-sign.1 \
+ #prebuilt/man/taler-auditor-sync.1 \
+ #prebuilt/man/taler-bank-benchmark.1 \
+ #prebuilt/man/taler-bank-transfer.1 \
prebuilt/man/taler-donau-aggregator.1 \
prebuilt/man/taler-donau-benchmark.1 \
prebuilt/man/taler-donau-closer.1 \
prebuilt/man/taler-donau-dbconfig.1 \
prebuilt/man/taler-donau-dbinit.1 \
- prebuilt/man/taler-donau-drain.1 \
- prebuilt/man/taler-donau-expire.1 \
+ #prebuilt/man/taler-donau-drain.1 \
+ #prebuilt/man/taler-donau-expire.1 \
prebuilt/man/taler-donau-httpd.1 \
- prebuilt/man/taler-donau-kyc-aml-pep-trigger.1 \
- prebuilt/man/taler-donau-kyc-tester.1 \
+ #prebuilt/man/taler-donau-kyc-aml-pep-trigger.1 \
+ #prebuilt/man/taler-donau-kyc-tester.1 \
prebuilt/man/taler-donau-offline.1 \
prebuilt/man/taler-donau-router.1\
prebuilt/man/taler-donau-secmod-cs.1\
prebuilt/man/taler-donau-secmod-eddsa.1\
prebuilt/man/taler-donau-secmod-rsa.1 \
- prebuilt/man/taler-donau-transfer.1\
- prebuilt/man/taler-donau-wire-gateway-client.1\
- prebuilt/man/taler-donau-wirewatch.1 \
- prebuilt/man/taler-helper-auditor-aggregation.1 \
- prebuilt/man/taler-helper-auditor-coins.1\
- prebuilt/man/taler-helper-auditor-deposits.1\
- prebuilt/man/taler-helper-auditor-purses.1\
- prebuilt/man/taler-helper-auditor-reserves.1\
- prebuilt/man/taler-helper-auditor-wire.1 \
+ #prebuilt/man/taler-donau-transfer.1\
+ #prebuilt/man/taler-donau-wire-gateway-client.1\
+ #prebuilt/man/taler-donau-wirewatch.1 \
+ #prebuilt/man/taler-helper-auditor-aggregation.1 \
+ #prebuilt/man/taler-helper-auditor-coins.1\
+ #prebuilt/man/taler-helper-auditor-deposits.1\
+ #prebuilt/man/taler-helper-auditor-purses.1\
+ #prebuilt/man/taler-helper-auditor-reserves.1\
+ #prebuilt/man/taler-helper-auditor-wire.1 \
prebuilt/man/taler-terms-generator.1 \
prebuilt/man/taler-unified-setup.1
-info_TEXINFOS = \
- prebuilt/texinfo/taler-auditor.texi \
- prebuilt/texinfo/taler-bank.texi \
- prebuilt/texinfo/taler-developer-manual.texi \
- prebuilt/texinfo/taler-donau.texi
+# info_TEXINFOS = \
+ #prebuilt/texinfo/taler-auditor.texi \
+ #prebuilt/texinfo/taler-bank.texi \
+ #prebuilt/texinfo/taler-developer-manual.texi \
+ #prebuilt/texinfo/taler-donau.texi
EXTRA_DIST = \
$(man_MANS) \
doxygen/taler.doxy \
$(info_TEXINFOS) \
- prebuilt/texinfo/taler-auditor-figures/auditor-db.png \
- prebuilt/texinfo/taler-auditor-figures/replication.png \
- prebuilt/texinfo/taler-bank-figures/arch-api.png \
- prebuilt/texinfo/taler-bank-figures/auditor-db.png \
- prebuilt/texinfo/taler-bank-figures/donau-db.png \
- prebuilt/texinfo/taler-bank-figures/charity-db.png \
- prebuilt/texinfo/taler-bank-figures/replication.png \
- prebuilt/texinfo/taler-developer-manual-figures/arch-api.png \
- prebuilt/texinfo/taler-developer-manual-figures/auditor-db.png \
- prebuilt/texinfo/taler-developer-manual-figures/donau-db.png \
- prebuilt/texinfo/taler-developer-manual-figures/charity-db.png \
- prebuilt/texinfo/taler-developer-manual-figures/replication.png \
- prebuilt/texinfo/taler-donau-figures/auditor-db.png \
- prebuilt/texinfo/taler-donau-figures/donau-db.png\
- prebuilt/texinfo/taler-donau-figures/replication.png
+ #prebuilt/texinfo/taler-auditor-figures/auditor-db.png \
+ #prebuilt/texinfo/taler-auditor-figures/replication.png \
+ #prebuilt/texinfo/taler-bank-figures/arch-api.png \
+ #prebuilt/texinfo/taler-bank-figures/auditor-db.png \
+ #prebuilt/texinfo/taler-bank-figures/donau-db.png \
+ #prebuilt/texinfo/taler-bank-figures/charity-db.png \
+ #prebuilt/texinfo/taler-bank-figures/replication.png \
+ #prebuilt/texinfo/taler-developer-manual-figures/arch-api.png \
+ #prebuilt/texinfo/taler-developer-manual-figures/auditor-db.png \
+ #prebuilt/texinfo/taler-developer-manual-figures/donau-db.png \
+ #prebuilt/texinfo/taler-developer-manual-figures/charity-db.png \
+ #prebuilt/texinfo/taler-developer-manual-figures/replication.png \
+ #prebuilt/texinfo/taler-donau-figures/auditor-db.png \
+ #prebuilt/texinfo/taler-donau-figures/donau-db.png\
+ #prebuilt/texinfo/taler-donau-figures/replication.png
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
@@ -9,7 +9,7 @@
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of CHARITYABILITY or FITNESS FOR A
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -14,7 +14,7 @@ pkgcfg_DATA = \
EXTRA_DIST = \
taler.conf
-SUBDIRS = \
+# SUBDIRS = \
include \
util \
json \
@@ -35,3 +35,18 @@ SUBDIRS = \
extensions/age_restriction \
testing \
benchmark
+
+
+SUBDIRS = \
+ include \
+ util \
+ json \
+ curl \
+ $(PQ_DIR) \
+ $(SQ_DIR) \
+ mhd \
+ donaudb \
+ donau \
+ lib \
+ donau-tools \
+ testing
diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am
@@ -19,11 +19,11 @@ bin_SCRIPTS = \
taler-donau-kyc-aml-pep-trigger.sh
bin_PROGRAMS = \
- taler-donau-httpd \
+ taler-donau-httpd
-taler_donau_aggregator_SOURCES = \
+# taler_donau_aggregator_SOURCES = \
taler-donau-aggregator.c
-taler_donau_aggregator_LDADD = \
+# taler_donau_aggregator_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/kyclogic/libtalerkyclogic.la \
$(top_builddir)/src/json/libtalerjson.la \
@@ -36,9 +36,9 @@ taler_donau_aggregator_LDADD = \
$(XLIB)
-taler_donau_closer_SOURCES = \
+# taler_donau_closer_SOURCES = \
taler-donau-closer.c
-taler_donau_closer_LDADD = \
+# taler_donau_closer_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \
@@ -49,9 +49,9 @@ taler_donau_closer_LDADD = \
-lgnunetutil \
$(XLIB)
-taler_donau_drain_SOURCES = \
+# taler_donau_drain_SOURCES = \
taler-donau-drain.c
-taler_donau_drain_LDADD = \
+# taler_donau_drain_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \
@@ -62,9 +62,9 @@ taler_donau_drain_LDADD = \
-lgnunetutil \
$(XLIB)
-taler_donau_expire_SOURCES = \
+# taler_donau_expire_SOURCES = \
taler-donau-expire.c
-taler_donau_expire_LDADD = \
+# taler_donau_expire_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \
@@ -75,9 +75,9 @@ taler_donau_expire_LDADD = \
-lgnunetutil \
$(XLIB)
-taler_donau_router_SOURCES = \
+# taler_donau_router_SOURCES = \
taler-donau-router.c
-taler_donau_router_LDADD = \
+# taler_donau_router_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \
@@ -88,9 +88,9 @@ taler_donau_router_LDADD = \
-lgnunetutil \
$(XLIB)
-taler_donau_transfer_SOURCES = \
+# taler_donau_transfer_SOURCES = \
taler-donau-transfer.c
-taler_donau_transfer_LDADD = \
+# taler_donau_transfer_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \
@@ -101,9 +101,9 @@ taler_donau_transfer_LDADD = \
-lgnunetutil \
$(XLIB)
-taler_donau_wirewatch_SOURCES = \
+# taler_donau_wirewatch_SOURCES = \
taler-donau-wirewatch.c
-taler_donau_wirewatch_LDADD = \
+# taler_donau_wirewatch_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \
@@ -117,7 +117,6 @@ taler_donau_wirewatch_LDADD = \
taler_donau_httpd_SOURCES = \
taler-donau-httpd.c taler-donau-httpd.h \
- taler-donau-httpd_auditors.c taler-donau-httpd_auditors.h \
taler-donau-httpd_aml-decision.c taler-donau-httpd_aml-decision.h \
taler-donau-httpd_aml-decision-get.c \
taler-donau-httpd_aml-decisions-get.c \
@@ -141,8 +140,6 @@ taler_donau_httpd_SOURCES = \
taler-donau-httpd_link.c taler-donau-httpd_link.h \
taler-donau-httpd_management.h \
taler-donau-httpd_management_aml-officers.c \
- taler-donau-httpd_management_auditors.c \
- taler-donau-httpd_management_auditors_AP_disable.c \
taler-donau-httpd_management_denominations_HDP_revoke.c \
taler-donau-httpd_management_drain.c \
taler-donau-httpd_management_extensions.c \
@@ -180,12 +177,10 @@ taler_donau_httpd_SOURCES = \
taler_donau_httpd_LDADD = \
$(LIBGCRYPT_LIBS) \
- $(top_builddir)/src/bank-lib/libtalerbank.la \
$(top_builddir)/src/mhd/libtalermhd.la \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/donaudb/libtalerdonaudb.la \
$(top_builddir)/src/templating/libtalertemplating.la \
- $(top_builddir)/src/kyclogic/libtalerkyclogic.la \
$(top_builddir)/src/util/libtalerutil.la \
$(top_builddir)/src/extensions/libtalerextensions.la \
-lmicrohttpd \
