diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-11-02 00:03:23 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-11-07 22:28:48 +0100 |
| commit | 30ee10437b3463cf27a092a0c533ad9f7466e75d (patch) | |
| tree | 3c1b664985324b84a0da510ab2e31cd2c398048b /libgphoto2_port | |
| parent | e866cd22566427d33003e3544f3fd22633384f6f (diff) | |
| download | libgphoto2-30ee10437b3463cf27a092a0c533ad9f7466e75d.tar.gz | |
Only use a single gphoto-m4/ subdir
Only use a single gphoto-m4/ subdir - namely that in
libgphoto2_port/gphoto-m4/. This prevents us from
needing to synchronize the contents of the gphoto-m4/
and the libgphoto2_port/gphoto-m4/ directories.
We can do that by switching from recursive make for the
gphoto-m4 subdirectories to using
include path/to/gphoto-m4/Makefile-files
from both the top-level Makefile.am and libgphoto2_port/Makefile.am
using %reldir% (introduced in automake 1.14).
Diffstat (limited to 'libgphoto2_port')
| -rw-r--r-- | libgphoto2_port/Makefile.am | 4 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am index 9170736a9..35e1302c8 100644 --- a/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/Makefile.am @@ -26,7 +26,9 @@ bin_SCRIPTS = gphoto2-port-config # The . stands for the current dir, i.e. the iolibs to build. # Make sure the iolibs are built before running tests on them. -SUBDIRS = po libgphoto2_port . tests doc gphoto-m4 +SUBDIRS = po libgphoto2_port . tests doc + +include gphoto-m4/Makefile-files ######################################################################## diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 7bcb0c90a..a20ab95ee 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -561,7 +561,6 @@ AC_CONFIG_FILES([ gphoto2-port-config tests/Makefile doc/Makefile - gphoto-m4/Makefile ]) AC_OUTPUT |