Have a Makefile.am per directory.

26 files changed, 251 insertions, 280 deletions

diff --git a/Makefile.am b/Makefile.am
index 075f40e..8e51600 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,213 +1,23 @@
-SUBDIRS = lib libprog . po tests
+SUBDIRS = lib libprog . po tests/libgnu tests/libprog
 
 LTV_CURRENT = 0
 LTV_REVISION = 0
 LTV_AGE = 0
 
-LTV_ADW_CURRENT = 0
-LTV_ADW_REVISION = 0
-LTV_ADW_AGE = 0
-
 DLL_VERSION = $$(expr $(LTV_CURRENT) - $(LTV_AGE))
-ADW_DLL_VERSION = $$(expr $(LTV_ADW_CURRENT) - $(LTV_ADW_AGE))
-
-bin_PROGRAMS = disfluid
-
-lib_LTLIBRARIES = \
-  libdisfluid.la \
-  libdisfluid-adwaita.la
-
-include_HEADERS = include/disfluid.h
-pkginclude_HEADERS = include/disfluid/adwaita.h
-
-ACLOCAL_AMFLAGS = -I m4 -I m4prog
-EXTRA_DIST = m4/gnulib-cache.m4 m4prog/gnulib-cache.m4 \
-  eu.planete_kraus.Disfluid.Source.svg \
-  eu.planete_kraus.Disfluid.Devel.svg \
-  eu.planete_kraus.Disfluid.svg \
-  eu.planete_kraus.Disfluid-symbolic.svg
-
-hicolordir = $(datadir)/icons/hicolor
-
-appscalablehicolordir = $(hicolordir)/scalable/apps
-appsymbolichicolordir = $(hicolordir)/scalable/apps
-app48hicolordir = $(hicolordir)/48x48/apps
-app256hicolordir = $(hicolordir)/256x256/apps
-
-dist_appscalablehicolor_DATA = \
-  eu.planete_kraus.Disfluid.Devel.svg \
-  eu.planete_kraus.Disfluid.svg
-
-dist_appsymbolichicolor_DATA = \
-  eu.planete_kraus.Disfluid-symbolic.svg
-
-dist_app48hicolor_DATA = \
-  icons/48x48/eu.planete_kraus.Disfluid.Devel.png \
-  icons/48x48/eu.planete_kraus.Disfluid.png \
-  icons/48x48/eu.planete_kraus.Disfluid.symbolic.png
-
-dist_app256hicolor_DATA = \
-  icons/256x256/eu.planete_kraus.Disfluid.Devel.png \
-  icons/256x256/eu.planete_kraus.Disfluid.png \
-  icons/256x256/eu.planete_kraus.Disfluid.symbolic.png
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA =
-EXTRA_DIST += \
-  eu.planete_kraus.Disfluid.desktop.in \
-  eu.planete_kraus.Disfluid.Devel.desktop.in
-
-if DISFLUID_IS_NIGHTLY
-dist_desktop_DATA += \
-  eu.planete_kraus.Disfluid.Devel.desktop
-else
-dist_desktop_DATA += \
-  eu.planete_kraus.Disfluid.desktop
-endif
-
-disfluid_SOURCES = \
-  src/disfluid/main.c
-
-disfluid_CPPFLAGS = \
-  -I libprog -I $(srcdir)/libprog \
-  -I include -I $(srcdir)/include \
-  -DLOCALEDIR=\"$(localedir)\" \
-  -DINSTALLDIR=\"$(bindir)\" \
-  -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
-
-disfluid_LDADD = \
-  libprog/libgnu.la \
-  libdisfluid.la \
-  libdisfluid-adwaita.la \
-  $(LIBTHREAD) \
-  $(LTLIBINTL) \
-  $(SETLOCALE_LIB) \
-  $(SETLOCALE_NULL_LIB) \
-  @INTL_MACOSX_LIBS@
-
-libdisfluid_la_SOURCES = \
-  src/libdisfluid/disfluid-authors.h \
-  src/libdisfluid/disfluid-init.h \
-  src/libdisfluid/disfluid-tests.h \
-  src/libdisfluid/disfluid-version.h \
-  src/libdisfluid.c
-
-libdisfluid_la_CPPFLAGS = \
-  -I lib -I $(srcdir)/lib \
-  -DBUILDING_LIBDISFLUID \
-  -I include -I $(srcdir)/include \
-  -DLOCALEDIR=\"$(localedir)\" \
-  -DINSTALLDIR=\"$(bindir)\" \
-  -DLATEST_MAJOR_VERSION=\"$$(cat .prev-version | sed 's/\.[0-9]+$$//')\"
-
-libdisfluid_la_CFLAGS = $(CFLAG_VISIBILITY)
-libdisfluid_la_LIBADD = \
-  lib/libgnu.la
-libdisfluid_la_LDFLAGS = \
-  -no-undefined \
-  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-  $(LIBTHREAD) \
-  $(LTLIBINTL) \
-  $(SETLOCALE_LIB) \
-  $(SETLOCALE_NULL_LIB) \
-  @INTL_MACOSX_LIBS@
-
-libdisfluid_adwaita_la_SOURCES = \
-  src/adwaita/disfluid-application.c \
-  src/adwaita/disfluid-about.c
-
-libdisfluid_adwaita_la_CPPFLAGS = \
-  -I lib -I $(srcdir)/lib \
-  -DBUILDING_LIBDISFLUID_ADWAITA \
-  -I include -I $(srcdir)/include \
-  -DLOCALEDIR=\"$(localedir)\" \
-  -DINSTALLDIR=\"$(bindir)\"
-
-libdisfluid_adwaita_la_CFLAGS = $(CFLAG_VISIBILITY)
-libdisfluid_adwaita_la_LIBADD = \
-  lib/libgnu.la
-libdisfluid_adwaita_la_LDFLAGS = \
-  -no-undefined \
-  -version-info $(LTV_ADW_CURRENT):$(LTV_ADW_REVISION):$(LTV_ADW_AGE) \
-  $(LIBTHREAD) \
-  $(LTLIBINTL) \
-  $(SETLOCALE_LIB) \
-  $(SETLOCALE_NULL_LIB) \
-  @INTL_MACOSX_LIBS@
-
-if RELOCATABLE_VIA_LD
-libdisfluid_la_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(libdir)`
-libdisfluid_adwaita_la_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(libdir)`
-endif
 
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+include_HEADERS =
+check_PROGRAMS =
 DISTCLEANFILES =
+EXTRA_DIST = m4/gnulib-cache.m4 m4prog/gnulib-cache.m4
+ACLOCAL_AMFLAGS = -I m4 -I m4prog
+TESTS =
 
-if HAVE_LD_OUTPUT_DEF
-libdisfluid_la_LDFLAGS += \
-  -Wl,--output-def,libdisfluid-$(DLL_VERSION).def
-libdisfluid_adwaita_la_LDFLAGS += \
-  -Wl,--output-def,libdisfluid-adwaita-$(ADW_DLL_VERSION).def
-
-libdisfluid-$(DLL_VERSION).def: libdisfluid.la
-libdisfluid-adwaita-$(ADW_DLL_VERSION).def: libdisfluid-adwaita.la
-
-defexecdir = $(libdir)
-defexec_DATA = \
-  libdisfluid-$(DLL_VERSION).def \
-  libdisfluid-adwaita-$(ADW_DLL_VERSION).def
-
-DISTCLEANFILES += $(defexec_DATA)
-endif
-
-TESTS = run-unit-tests
-check_PROGRAMS = run-unit-tests
-
-run_unit_tests_SOURCES = src/run-unit-tests.c
-run_unit_tests_CPPFLAGS = \
-  -I libprog -I $(srcdir)/libprog \
-  -I include -I $(srcdir)/include \
-  -DLOCALEDIR=\"$(localedir)\" \
-  -DINSTALLDIR=\"$(bindir)\" \
-  -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
-
-run_unit_tests_LDADD = \
-  libprog/libgnu.la \
-  libdisfluid.la \
-  $(LIBTHREAD) \
-  $(LTLIBINTL) \
-  $(SETLOCALE_LIB) \
-  $(SETLOCALE_NULL_LIB) \
-  @INTL_MACOSX_LIBS@
-
-AM_TESTS_ENVIRONMENT = \
-  export LD_LIBRARY_PATH=.libs$(PATH_SEPARATOR)$$LD_LIBRARY_PATH ;
-
-icons/48x48/eu.planete_kraus.Disfluid.Devel.png: eu.planete_kraus.Disfluid.Devel.svg
-	@mkdir -p icons/48x48
-	$(AM_V_GEN) $(CONVERT) -resize 48x48 -background none $(srcdir)/eu.planete_kraus.Disfluid.Devel.svg $(srcdir)/icons/48x48/eu.planete_kraus.Disfluid.Devel.png
-
-icons/48x48/eu.planete_kraus.Disfluid.png: eu.planete_kraus.Disfluid.svg
-	@mkdir -p icons/48x48
-	$(AM_V_GEN) $(CONVERT) -resize 48x48 -background none $(srcdir)/eu.planete_kraus.Disfluid.svg $(srcdir)/icons/48x48/eu.planete_kraus.Disfluid.png
-
-icons/48x48/eu.planete_kraus.Disfluid.symbolic.png: eu.planete_kraus.Disfluid-symbolic.svg
-	@mkdir -p icons/48x48
-	$(AM_V_GEN) $(CONVERT) -resize 48x48 -background none $(srcdir)/eu.planete_kraus.Disfluid-symbolic.svg $(srcdir)/icons/48x48/eu.planete_kraus.Disfluid.symbolic.png
-
-icons/256x256/eu.planete_kraus.Disfluid.Devel.png: eu.planete_kraus.Disfluid.Devel.svg
-	@mkdir -p icons/256x256
-	$(AM_V_GEN) $(CONVERT) -resize 256x256 -background none -density 1200 $(srcdir)/eu.planete_kraus.Disfluid.Devel.svg $(srcdir)/icons/256x256/eu.planete_kraus.Disfluid.Devel.png
-
-icons/256x256/eu.planete_kraus.Disfluid.png: eu.planete_kraus.Disfluid.svg
-	@mkdir -p icons/256x256
-	$(AM_V_GEN) $(CONVERT) -resize 256x256 -background none -density 1200 $(srcdir)/eu.planete_kraus.Disfluid.svg $(srcdir)/icons/256x256/eu.planete_kraus.Disfluid.png
-
-icons/256x256/eu.planete_kraus.Disfluid.symbolic.png: eu.planete_kraus.Disfluid-symbolic.svg
-	@mkdir -p icons/256x256
-	$(AM_V_GEN) $(CONVERT) -resize 256x256 -background none -density 1200 $(srcdir)/eu.planete_kraus.Disfluid-symbolic.svg $(srcdir)/icons/256x256/eu.planete_kraus.Disfluid.symbolic.png
-
-eu.planete_kraus.Disfluid.desktop: eu.planete_kraus.Disfluid.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template=$(srcdir)/eu.planete_kraus.Disfluid.desktop.in -d $(srcdir)/po -o $(srcdir)/eu.planete_kraus.Disfluid.desktop
-
-eu.planete_kraus.Disfluid.Devel.desktop: eu.planete_kraus.Disfluid.Devel.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template=$(srcdir)/eu.planete_kraus.Disfluid.Devel.desktop.in -d $(srcdir)/po -o $(srcdir)/eu.planete_kraus.Disfluid.Devel.desktop
+include %D%/include/Makefile.am
+include %D%/src/Makefile.am
+include %D%/icons/Makefile.am
+include %D%/desktop/Makefile.am
+include %D%/tests/Makefile.am
diff --git a/bootstrap.conf b/bootstrap.conf
index e44d986..a80b876 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,7 +42,7 @@ XGETTEXT_OPTIONS='\\\
 
 gnulib_name=libgnu
 
-gnulib_tool_option_extras='--makefile-name=Makefile.gnulib'
+gnulib_tool_option_extras='--makefile-name=Makefile.gnulib --with-tests --tests-base=tests/libgnu --tests-makefile-name=Makefile.am'
 
 checkout_only_file=guix.scm
 
@@ -58,5 +58,8 @@ bootstrap_post_import_hook ()
                                  --aux-dir=build-aux \
                                  --libtool \
                                  --macro-prefix=glprog \
+                                 --with-tests \
+                                 --tests-base=tests/libprog \
+                                 --tests-makefile-name=Makefile.am \
                                  relocatable-prog gettext-h locale setlocale stdbool attribute
 }
diff --git a/configure.ac b/configure.ac
index 168c3eb..9250f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,5 +81,5 @@ AC_CONFIG_FILES([
   Makefile
   lib/Makefile libprog/Makefile
   po/Makefile.in
-  tests/Makefile])
+  tests/libgnu/Makefile tests/libprog/Makefile])
 AC_OUTPUT
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
new file mode 100644
index 0000000..b7e9836
--- /dev/null
+++ b/desktop/Makefile.am
@@ -0,0 +1,19 @@
+desktopdir = $(datadir)/applications
+dist_desktop_DATA =
+EXTRA_DIST += \
+  %D%/eu.planete_kraus.Disfluid.desktop.in \
+  %D%/eu.planete_kraus.Disfluid.Devel.desktop.in
+
+if DISFLUID_IS_NIGHTLY
+dist_desktop_DATA += \
+  %D%/eu.planete_kraus.Disfluid.Devel.desktop
+else
+dist_desktop_DATA += \
+  %D%/eu.planete_kraus.Disfluid.desktop
+endif
+
+%D%/eu.planete_kraus.Disfluid.desktop: %D%/eu.planete_kraus.Disfluid.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template=$(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop.in -d $(srcdir)/po -o $(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop
+
+%D%/eu.planete_kraus.Disfluid.Devel.desktop: %D%/eu.planete_kraus.Disfluid.Devel.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template=$(srcdir)/%D%/eu.planete_kraus.Disfluid.Devel.desktop.in -d $(srcdir)/po -o $(srcdir)/%D%/eu.planete_kraus.Disfluid.Devel.desktop
diff --git a/eu.planete_kraus.Disfluid.Devel.desktop.in b/desktop/eu.planete_kraus.Disfluid.Devel.desktop.in
index 9dfb455..9dfb455 100644
--- a/eu.planete_kraus.Disfluid.Devel.desktop.in
+++ b/desktop/eu.planete_kraus.Disfluid.Devel.desktop.in
diff --git a/eu.planete_kraus.Disfluid.desktop.in b/desktop/eu.planete_kraus.Disfluid.desktop.in
index 47833fb..47833fb 100644
--- a/eu.planete_kraus.Disfluid.desktop.in
+++ b/desktop/eu.planete_kraus.Disfluid.desktop.in
diff --git a/guix.scm b/guix.scm
index f95785d..275f2ad 100644
--- a/guix.scm
+++ b/guix.scm
@@ -144,7 +144,7 @@
               (invoke "git" "checkout" "--" "bootstrap-bootstrap")
               (patch-shebang "configure")
               (invoke "make" "-j8" "distcheck"
-                      (format #f "DISTCHECK_CONFIGURE_FLAGS=SHELL=~a" (which "sh")))
+                      (format #f "DISTCHECK_CONFIGURE_FLAGS=SHELL=~a" (which "bash")))
               (invoke "tar" "xf" #$(format #f "disfluid-~a.tar.gz" disfluid:package-version))
               (with-directory-excursion
                   #$(format #f "disfluid-~a" disfluid:package-version)
@@ -165,6 +165,21 @@
                                    "missing" "config.libpath" "reloc-ldflags" "ar-lib"
                                    "config.guess" "vc-list-files" "install-reloc")
                       (("#!/gnu/store/.*/bin/sh")
+                       "#!/bin/sh")))
+                  (with-directory-excursion "tests/libgnu"
+                    (substitute* '("test-verify.sh" "test-select-out.sh" "test-select-in.sh"
+                                   "test-vc-list-files-git.sh" "test-setlocale1.sh"
+                                   "test-lseek.sh" "test-binary-io.sh" "test-ftruncate.sh"
+                                   "test-init.sh" "test-vc-list-files-cvs.sh"
+                                   "test-setlocale2.sh" "test-perror.sh")
+                      (("#!/gnu/store/.*/bin/sh")
+                       "#!/bin/sh")))
+                  (with-directory-excursion "tests/libprog"
+                    (substitute* '("test-verify.sh" "test-select-out.sh" "test-select-in.sh"
+                                   "test-xalloc-die.sh" "test-setlocale1.sh"
+                                   "test-binary-io.sh" "test-ftruncate.sh"
+                                   "test-init.sh" "test-setlocale2.sh" "test-perror.sh")
+                      (("#!/gnu/store/.*/bin/sh")
                        "#!/bin/sh"))))
               (invoke "sh" "-c" "grep '/gnu/store/' -R disfluid-* && exit 1 ; true")
               (mkdir-p #$output)
@@ -177,7 +192,7 @@
                       #$(format #f "disfluid-~a" disfluid:package-version)))))))
     (native-inputs
      (list autoconf autoconf-archive automake libtool gnu-gettext
-	   git valgrind (list glibc "debug")
+	   git valgrind/interactive
 	   tar gzip global pkg-config
 	   texinfo (texlive-updmap.cfg (list texlive))
            perl gnulib gtk check (list glib "bin")
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..d1e4959
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1,53 @@
+EXTRA_DIST += \
+  %D%/eu.planete_kraus.Disfluid.Source.svg \
+  %D%/eu.planete_kraus.Disfluid.Devel.svg \
+  %D%/eu.planete_kraus.Disfluid.svg \
+  %D%/eu.planete_kraus.Disfluid-symbolic.svg
+
+hicolordir = $(datadir)/icons/hicolor
+
+appscalablehicolordir = $(hicolordir)/scalable/apps
+appsymbolichicolordir = $(hicolordir)/symbolic/apps
+app48hicolordir = $(hicolordir)/48x48/apps
+app256hicolordir = $(hicolordir)/256x256/apps
+
+dist_appscalablehicolor_DATA = \
+  %D%/eu.planete_kraus.Disfluid.Devel.svg \
+  %D%/eu.planete_kraus.Disfluid.svg
+
+dist_appsymbolichicolor_DATA = \
+  %D%/eu.planete_kraus.Disfluid-symbolic.svg
+
+dist_app48hicolor_DATA = \
+  %D%/icons/48x48/eu.planete_kraus.Disfluid.Devel.png \
+  %D%/icons/48x48/eu.planete_kraus.Disfluid.png \
+  %D%/icons/48x48/eu.planete_kraus.Disfluid.symbolic.png
+
+dist_app256hicolor_DATA = \
+  %D%/icons/256x256/eu.planete_kraus.Disfluid.Devel.png \
+  %D%/icons/256x256/eu.planete_kraus.Disfluid.png \
+  %D%/icons/256x256/eu.planete_kraus.Disfluid.symbolic.png
+
+%D%/icons/48x48/eu.planete_kraus.Disfluid.Devel.png: %D%/eu.planete_kraus.Disfluid.Devel.svg
+	@mkdir -p %D%/icons/48x48
+	$(AM_V_GEN) $(CONVERT) -resize 48x48 -background none $(srcdir)/%D%/eu.planete_kraus.Disfluid.Devel.svg $(srcdir)/%D%/icons/48x48/eu.planete_kraus.Disfluid.Devel.png
+
+%D%/icons/48x48/eu.planete_kraus.Disfluid.png: %D%/eu.planete_kraus.Disfluid.svg
+	@mkdir -p %D%/icons/48x48
+	$(AM_V_GEN) $(CONVERT) -resize 48x48 -background none $(srcdir)/%D%/eu.planete_kraus.Disfluid.svg $(srcdir)/%D%/icons/48x48/eu.planete_kraus.Disfluid.png
+
+%D%/icons/48x48/eu.planete_kraus.Disfluid.symbolic.png: %D%/eu.planete_kraus.Disfluid-symbolic.svg
+	@mkdir -p %D%/icons/48x48
+	$(AM_V_GEN) $(CONVERT) -resize 48x48 -background none $(srcdir)/%D%/eu.planete_kraus.Disfluid-symbolic.svg $(srcdir)/%D%/icons/48x48/eu.planete_kraus.Disfluid.symbolic.png
+
+%D%/icons/256x256/eu.planete_kraus.Disfluid.Devel.png: %D%/eu.planete_kraus.Disfluid.Devel.svg
+	@mkdir -p %D%/icons/256x256
+	$(AM_V_GEN) $(CONVERT) -resize 256x256 -background none -density 1200 $(srcdir)/%D%/eu.planete_kraus.Disfluid.Devel.svg $(srcdir)/%D%/icons/256x256/eu.planete_kraus.Disfluid.Devel.png
+
+%D%/icons/256x256/eu.planete_kraus.Disfluid.png: %D%/eu.planete_kraus.Disfluid.svg
+	@mkdir -p %D%/icons/256x256
+	$(AM_V_GEN) $(CONVERT) -resize 256x256 -background none -density 1200 $(srcdir)/%D%/eu.planete_kraus.Disfluid.svg $(srcdir)/%D%/icons/256x256/eu.planete_kraus.Disfluid.png
+
+%D%/icons/256x256/eu.planete_kraus.Disfluid.symbolic.png: %D%/eu.planete_kraus.Disfluid-symbolic.svg
+	@mkdir -p %D%/icons/256x256
+	$(AM_V_GEN) $(CONVERT) -resize 256x256 -background none -density 1200 $(srcdir)/%D%/eu.planete_kraus.Disfluid-symbolic.svg $(srcdir)/%D%/icons/256x256/eu.planete_kraus.Disfluid.symbolic.png
diff --git a/eu.planete_kraus.Disfluid-symbolic.svg b/icons/eu.planete_kraus.Disfluid-symbolic.svg
index f2f7a6b..f2f7a6b 100644
--- a/eu.planete_kraus.Disfluid-symbolic.svg
+++ b/icons/eu.planete_kraus.Disfluid-symbolic.svg
diff --git a/eu.planete_kraus.Disfluid.Devel.svg b/icons/eu.planete_kraus.Disfluid.Devel.svg
index dca98a9..dca98a9 100644
--- a/eu.planete_kraus.Disfluid.Devel.svg
+++ b/icons/eu.planete_kraus.Disfluid.Devel.svg
diff --git a/eu.planete_kraus.Disfluid.Source.svg b/icons/eu.planete_kraus.Disfluid.Source.svg
index 6e3f5e7..6e3f5e7 100644
--- a/eu.planete_kraus.Disfluid.Source.svg
+++ b/icons/eu.planete_kraus.Disfluid.Source.svg
diff --git a/eu.planete_kraus.Disfluid.svg b/icons/eu.planete_kraus.Disfluid.svg
index c5fa9c2..c5fa9c2 100644
--- a/eu.planete_kraus.Disfluid.svg
+++ b/icons/eu.planete_kraus.Disfluid.svg
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..f935635
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+include_HEADERS += %D%/disfluid.h
diff --git a/include/disfluid/adwaita.h b/include/disfluid/adwaita.h
deleted file mode 100644
index 8893168..0000000
--- a/include/disfluid/adwaita.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef H_DISFLUID_ADWAITA_INCLUDED
-# define H_DISFLUID_ADWAITA_INCLUDED
-
-# include <stdlib.h>
-# include <glib-object.h>
-# include <gtk/gtk.h>
-
-# if defined _WIN32 && !defined __CYGWIN__
-#  define LIBDISFLUID_ADWAITA_DLL_MADNESS 1
-# else
-#  define LIBDISFLUID_ADWAITA_DLL_MADNESS 0
-# endif
-
-# if BUILDING_LIBDISFLUID_ADWAITA && HAVE_VISIBILITY
-#  define LIBDISFLUID_ADWAITA_DLL_EXPORTED __attribute__((__visibility__("default")))
-# elif BUILDING_LIBDISFLUID_ADWAITA && LIBDISFLUID_ADWAITA_DLL_MADNESS
-#  define LIBDISFLUID_ADWAITA_DLL_EXPORTED __declspec(dllexport)
-# elif LIBDISFLUID_ADWAITA_DLL_MADNESS
-#  define LIBDISFLUID_ADWAITA_DLL_EXPORTED __declspec(dllimport)
-# else
-#  define LIBDISFLUID_ADWAITA_DLL_EXPORTED
-# endif
-
-# define LIBDISFLUID_ADWAITA_API \
-  LIBDISFLUID_ADWAITA_DLL_EXPORTED
-
-# ifdef ATTRIBUTE_DEALLOC
-#  define LIBDISFLUID_ADWAITA_DEALLOC_WITH ATTRIBUTE_DEALLOC
-# else
-#  define LIBDISFLUID_ADWAITA_DEALLOC_WITH(f, i)
-# endif
-
-# ifdef ATTRIBUTE_CONST
-#  define LIBDISFLUID_ADWAITA_CONST ATTRIBUTE_CONST
-# else
-#  define LIBDISFLUID_ADWAITA_CONST
-# endif
-
-# ifdef __cplusplus
-extern "C"
-{
-# endif				/* __cplusplus */
-
-  struct DisfluidAdwApplication;
-
-  LIBDISFLUID_ADWAITA_CONST LIBDISFLUID_ADWAITA_API extern GType
-    disfluid_adw_application_get_type (void);
-
-  LIBDISFLUID_ADWAITA_API extern struct DisfluidAdwApplication
-    *disfluid_adw_application_new (void);
-
-  LIBDISFLUID_ADWAITA_CONST LIBDISFLUID_ADWAITA_API extern const char
-    *disfluid_adw_application_id (void);
-
-  LIBDISFLUID_ADWAITA_API extern
-    void disfluid_adw_show_about (GtkApplication * app);
-
-# ifdef __cplusplus
-}
-# endif				/* __cplusplus */
-
-#endif				/* not H_DISFLUID_ADWAITA_INCLUDED */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea78c9a..f15e90a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,7 @@
-# List of source files which contain translatable strings.
+desktop/eu.planete_kraus.Disfluid.Devel.desktop.in
+desktop/eu.planete_kraus.Disfluid.desktop.in
 src/adwaita/disfluid-about.c
 src/adwaita/disfluid-application.c
 src/libdisfluid/disfluid-authors.h
 src/libdisfluid/disfluid-tests.h
 src/libdisfluid/disfluid-version.h
-eu.planete_kraus.Disfluid.desktop.in
-eu.planete_kraus.Disfluid.Devel.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..bdb7b63
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,3 @@
+include %D%/libdisfluid/Makefile.am
+include %D%/adwaita/Makefile.am
+include %D%/disfluid/Makefile.am
diff --git a/src/adwaita/Makefile.am b/src/adwaita/Makefile.am
new file mode 100644
index 0000000..80d724a
--- /dev/null
+++ b/src/adwaita/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LTLIBRARIES += %D%/libdisfluid-adwaita.la
+
+%C%_libdisfluid_adwaita_la_SOURCES = \
+  %D%/disfluid-adwaita.h \
+  %D%/disfluid-about.c \
+  %D%/disfluid-application.c
+
+%C%_libdisfluid_adwaita_la_CPPFLAGS = \
+  -I lib -I $(srcdir)/lib \
+  -I include -I $(srcdir)/include \
+  -I %D% -I $(srcdir)/%D% \
+  -DLOCALEDIR=\"$(localedir)\" \
+  -DINSTALLDIR=\"$(bindir)\"
+
+%C%_libdisfluid_adwaita_la_LIBADD = \
+  lib/libgnu.la
+
+%C%_libdisfluid_adwaita_la_LDFLAGS = \
+  $(LIBTHREAD) \
+  $(LTLIBINTL) \
+  $(SETLOCALE_LIB) \
+  $(SETLOCALE_NULL_LIB) \
+  @INTL_MACOSX_LIBS@
diff --git a/src/adwaita/disfluid-about.c b/src/adwaita/disfluid-about.c
index b87b1c5..028b762 100644
--- a/src/adwaita/disfluid-about.c
+++ b/src/adwaita/disfluid-about.c
@@ -2,7 +2,7 @@
 
 #include "attribute.h"
 #include <disfluid.h>
-#include <disfluid/adwaita.h>
+#include "disfluid-adwaita.h"
 
 #define STREQ(a, b) (strcmp ((a), (b)) == 0)
 #define STRNEQ(a, b) (! (STREQ (a, b)))
diff --git a/src/adwaita/disfluid-adwaita.h b/src/adwaita/disfluid-adwaita.h
new file mode 100644
index 0000000..f3772cc
--- /dev/null
+++ b/src/adwaita/disfluid-adwaita.h
@@ -0,0 +1,18 @@
+#ifndef H_DISFLUID_ADWAITA_INCLUDED
+# define H_DISFLUID_ADWAITA_INCLUDED
+
+# include <stdlib.h>
+# include <glib-object.h>
+# include <gtk/gtk.h>
+
+struct DisfluidAdwApplication;
+
+ATTRIBUTE_CONST GType disfluid_adw_application_get_type (void);
+
+struct DisfluidAdwApplication *disfluid_adw_application_new (void);
+
+ATTRIBUTE_CONST const char *disfluid_adw_application_id (void);
+
+void disfluid_adw_show_about (GtkApplication * app);
+
+#endif /* not H_DISFLUID_ADWAITA_INCLUDED */
diff --git a/src/adwaita/disfluid-application.c b/src/adwaita/disfluid-application.c
index a0cc21d..2adf33c 100644
--- a/src/adwaita/disfluid-application.c
+++ b/src/adwaita/disfluid-application.c
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include "attribute.h"
-#include <disfluid/adwaita.h>
+#include <disfluid-adwaita.h>
 
 #define STREQ(a, b) (strcmp ((a), (b)) == 0)
 #define STRNEQ(a, b) (! (STREQ (a, b)))
diff --git a/src/disfluid/Makefile.am b/src/disfluid/Makefile.am
new file mode 100644
index 0000000..f9a4646
--- /dev/null
+++ b/src/disfluid/Makefile.am
@@ -0,0 +1,19 @@
+bin_PROGRAMS += %D%/disfluid
+
+%C%_disfluid_SOURCES = \
+  %D%/main.c
+%C%_disfluid_CPPFLAGS = \
+  -I libprog -I $(srcdir)/libprog \
+  -I include -I $(srcdir)/include \
+  -DLOCALEDIR=\"$(localedir)\" \
+  -DINSTALLDIR=\"$(bindir)\" \
+  -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
+%C%_disfluid_LDADD = \
+  libprog/libgnu.la \
+  src/libdisfluid/libdisfluid.la \
+  src/adwaita/libdisfluid-adwaita.la \
+  $(LIBTHREAD) \
+  $(LTLIBINTL) \
+  $(SETLOCALE_LIB) \
+  $(SETLOCALE_NULL_LIB) \
+  @INTL_MACOSX_LIBS@
diff --git a/src/disfluid/main.c b/src/disfluid/main.c
index 75f0700..19f610a 100644
--- a/src/disfluid/main.c
+++ b/src/disfluid/main.c
@@ -7,7 +7,7 @@
 #include "progname.h"
 #include "relocatable.h"
 
-#include <disfluid/adwaita.h>
+#include "../adwaita/disfluid-adwaita.h"
 #include <glib.h>
 #include <adwaita.h>
 
diff --git a/src/libdisfluid/Makefile.am b/src/libdisfluid/Makefile.am
new file mode 100644
index 0000000..97c2ba3
--- /dev/null
+++ b/src/libdisfluid/Makefile.am
@@ -0,0 +1,46 @@
+lib_LTLIBRARIES += %D%/libdisfluid.la
+
+%C%_libdisfluid_la_SOURCES = \
+  %D%/disfluid-authors.h \
+  %D%/disfluid-init.h \
+  %D%/disfluid-tests.h \
+  %D%/disfluid-version.h \
+  %D%/main.c
+
+%C%_libdisfluid_la_CPPFLAGS = \
+  -I lib -I $(srcdir)/lib \
+  -DBUILDING_LIBDISFLUID \
+  -I include -I $(srcdir)/include \
+  -I %D% -I $(srcdir)/%D% \
+  -DLOCALEDIR=\"$(localedir)\" \
+  -DINSTALLDIR=\"$(bindir)\" \
+  -DLATEST_MAJOR_VERSION=\"$$(cat .prev-version | sed 's/\.[0-9]+$$//')\"
+
+%C%_libdisfluid_la_CFLAGS = $(CFLAG_VISIBILITY)
+%C%_libdisfluid_la_LIBADD = \
+  lib/libgnu.la
+%C%_libdisfluid_la_LDFLAGS = \
+  -no-undefined \
+  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+  $(LIBTHREAD) \
+  $(LTLIBINTL) \
+  $(SETLOCALE_LIB) \
+  $(SETLOCALE_NULL_LIB) \
+  @INTL_MACOSX_LIBS@
+
+if RELOCATABLE_VIA_LD
+%C%_libdisfluid_la_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(libdir)`
+endif
+
+if HAVE_LD_OUTPUT_DEF
+%C%_libdisfluid_la_LDFLAGS += \
+  -Wl,--output-def,libdisfluid-$(DLL_VERSION).def
+
+%D%/libdisfluid-$(DLL_VERSION).def: %D%/libdisfluid.la
+
+defexecdir = $(libdir)
+defexec_DATA = \
+  %D%/libdisfluid-$(DLL_VERSION).def
+
+DISTCLEANFILES += $(defexec_DATA)
+endif
diff --git a/src/libdisfluid.c b/src/libdisfluid/main.c
index 985261b..666061c 100644
--- a/src/libdisfluid.c
+++ b/src/libdisfluid/main.c
@@ -15,9 +15,9 @@
 #define _(String) dgettext (PACKAGE, (String))
 #define N_(String) (String)
 
-#include "libdisfluid/disfluid-version.h"
-#include "libdisfluid/disfluid-tests.h"
-#include "libdisfluid/disfluid-authors.h"
+#include "disfluid-version.h"
+#include "disfluid-tests.h"
+#include "disfluid-authors.h"
 
 const char *
 disfluid_version (void)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e389584..086ab6c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,25 @@
-include Makefile.gnulib
+TESTS += %D%/run-unit-tests
+check_PROGRAMS += %D%/run-unit-tests
+
+%C%_run_unit_tests_SOURCES = %D%/run-unit-tests.c
+%C%_run_unit_tests_CPPFLAGS = \
+  -I libprog -I $(srcdir)/libprog \
+  -I include -I $(srcdir)/include \
+  -DLOCALEDIR=\"$(localedir)\" \
+  -DINSTALLDIR=\"$(bindir)\" \
+  -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
+
+%C%_run_unit_tests_LDADD = \
+  libprog/libgnu.la \
+  src/libdisfluid/libdisfluid.la \
+  $(LIBTHREAD) \
+  $(LTLIBINTL) \
+  $(SETLOCALE_LIB) \
+  $(SETLOCALE_NULL_LIB) \
+  @INTL_MACOSX_LIBS@
+
+LOG_COMPILER = $(LIBTOOL) --mode=execute $(LOG_VALGRIND)
+
+AM_TESTS_ENVIRONMENT = \
+  >&2 echo "I don’t understand why, but the libtool script during distcheck on guix does not set up LD_LIBRARY_PATH." ; \
+  export "LD_LIBRARY_PATH=$(abs_top_builddir)/src/libdisfluid/.libs$(PATH_SEPARATOR)$$LD_LIBRARY_PATH" ;
diff --git a/src/run-unit-tests.c b/tests/run-unit-tests.c
index 5361b72..5361b72 100644
--- a/src/run-unit-tests.c
+++ b/tests/run-unit-tests.c