summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2020-01-22 00:31:44 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2020-01-22 10:12:56 +0100
commit77db513adb3db237e2a1d09faa44adb2029af322 (patch)
treeb47b17624410d56a4cbf09b18eb23802bc42c766
parentde98b151bce6b0aa70157d6c0ebb7f59b4da3792 (diff)
downloadlibgphoto2-77db513adb3db237e2a1d09faa44adb2029af322.tar.gz
camlibs: Move camlib specific SUBDIRS addtions to subdir Makefile-files
Move camlib specific SUBDIRS additions to subdir Makefile-files where they logically belong.
-rw-r--r--camlibs/Makefile.am2
-rw-r--r--camlibs/canon/Makefile-files2
-rw-r--r--camlibs/konica/Makefile-files2
3 files changed, 5 insertions, 1 deletions
diff --git a/camlibs/Makefile.am b/camlibs/Makefile.am
index 39e4ddb46..c6a6e257a 100644
--- a/camlibs/Makefile.am
+++ b/camlibs/Makefile.am
@@ -19,7 +19,7 @@
#
# Building the camlibs itself is defined in the Makefile-files
# included below.
-SUBDIRS = . canon/doc konica/localization
+SUBDIRS = .
########################################################################
diff --git a/camlibs/canon/Makefile-files b/camlibs/canon/Makefile-files
index 08c002e8b..fe02b85d0 100644
--- a/camlibs/canon/Makefile-files
+++ b/camlibs/canon/Makefile-files
@@ -1,5 +1,7 @@
# -*- Makefile -*-
+SUBDIRS += canon/doc
+
EXTRA_LTLIBRARIES += canon.la
camlibdoc_DATA += canon/README.canon
diff --git a/camlibs/konica/Makefile-files b/camlibs/konica/Makefile-files
index 324c0c15b..5d20d348f 100644
--- a/camlibs/konica/Makefile-files
+++ b/camlibs/konica/Makefile-files
@@ -1,5 +1,7 @@
# -*- Makefile -*-
+SUBDIRS += konica/localization
+
EXTRA_DIST += konica/EXPERTS konica/qm150.txt konica/README.konica konica/ChangeLog konica/COPYING konica/TODO
camlibdoc_DATA += konica/README.konica