diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2019-10-31 23:38:39 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-01-18 19:33:16 +0100 |
| commit | c02ffbc1f1b67fcc8dc4d185c32c4da51b74882a (patch) | |
| tree | e1f4b5f59fcf56dbc6dc6a220a097872dce0ee1b | |
| parent | fa597642871e284bb1b7c86996bb58c79c9c799c (diff) | |
| download | libgphoto2-c02ffbc1f1b67fcc8dc4d185c32c4da51b74882a.tar.gz | |
Add $(AM_MAKEFLAGS) for every $(MAKE)
For every $(MAKE) use in Makefile.am or Makefile-files, we
add $(AM_MAKEFLAGS) so we can pass the make flags to the
called make subprocess.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | camlibs/Makefile.am | 2 | ||||
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/rpm/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/ddb/Makefile.am | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 37e500570..b33481468 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,7 +76,7 @@ source-code-check: # Usage: make CAMLIBS="canon.la ptp2.la" install-camlibs install-camlibs: - cd camlibs && $(MAKE) CAMLIBS="$(CAMLIBS)" install-camlibs + cd camlibs && $(MAKE) $(AM_MAKEFLAGS) CAMLIBS="$(CAMLIBS)" install-camlibs ######################################################################## @@ -95,8 +95,8 @@ if ENABLE_RPM # create RPM packages rpm: Makefile - $(MAKE) dist - $(MAKE) -C packaging/rpm rpm + $(MAKE) $(AM_MAKEFLAGS) dist + cd packaging/rpm && $(MAKE) $(AM_MAKEFLAGS) rpm @echo "The RPM packages should now be found in packaging/rpm/RPMS" else diff --git a/camlibs/Makefile.am b/camlibs/Makefile.am index 53f210d85..39e4ddb46 100644 --- a/camlibs/Makefile.am +++ b/camlibs/Makefile.am @@ -156,7 +156,7 @@ all-local: Makefile # Usage: make CAMLIBS="canon.la ptp2.la" install-camlibs install-camlibs: - $(MAKE) BUILD_THESE_CAMLIBS="$(CAMLIBS)" install-camlibLTLIBRARIES + $(MAKE) $(AM_MAKEFLAGS) BUILD_THESE_CAMLIBS="$(CAMLIBS)" install-camlibLTLIBRARIES ######################################################################## diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am index 862aa7e10..70fd0fdf5 100644 --- a/libgphoto2_port/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/libgphoto2_port/Makefile.am @@ -59,5 +59,5 @@ EXTRA_DIST = \ libgphoto2_port.ver ../libltdl/libltdlc.la: - cd ../libltdl && $(MAKE) libltdlc.la + cd ../libltdl && $(MAKE) $(AM_MAKEFLAGS) libltdlc.la diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am index 9838dc025..45fcebaad 100644 --- a/packaging/rpm/Makefile.am +++ b/packaging/rpm/Makefile.am @@ -15,12 +15,12 @@ clean-local: cp $< $@ rpm: Makefile package.spec - $(MAKE) clean + $(MAKE) $(AM_MAKEFLAGS) clean mkdir -p BUILD SPECS SOURCES SRPMS for arch in i386 i486 i586 i686 alpha noarch; do \ mkdir -p "RPMS/$${arch}"; \ done - $(MAKE) SOURCES/@PACKAGE@-@VERSION@.tar.gz SPECS/@PACKAGE@-@VERSION@.spec + $(MAKE) $(AM_MAKEFLAGS) SOURCES/@PACKAGE@-@VERSION@.tar.gz SPECS/@PACKAGE@-@VERSION@.spec @RPMBUILD@ --define "_topdir $$(pwd)" -ba SPECS/@PACKAGE@-@VERSION@.spec SOURCES/@PACKAGE@-@VERSION@.tar.gz: $(top_srcdir)/@PACKAGE@-@VERSION@.tar.gz diff --git a/tests/ddb/Makefile.am b/tests/ddb/Makefile.am index e1031654c..52e07ea42 100644 --- a/tests/ddb/Makefile.am +++ b/tests/ddb/Makefile.am @@ -45,7 +45,7 @@ clean-local: rm -f *.s *.i $(top_builddir)/packaging/generic/print-camera-list: - cd $(top_builddir)/packaging/generic && $(MAKE) print-camera-list + cd $(top_builddir)/packaging/generic && $(MAKE) $(AM_MAKEFLAGS) print-camera-list include $(top_srcdir)/installcheck.mk |