diff --git a/Makefile.am b/Makefile.am index 82460d9956..4b4d74b166 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,9 +116,15 @@ update-po: @GP_GETTEXT_SETUP_MK@ -# Dummy target to force Automake to make the all target depend on it +# We need *some* `all-local` target (dummy or real) to force Automake +# to make the `all` target depend on it. In this case, print build +# flags for debugging purposes. all-local: - @: + @test -z "$(CFLAGS)" || printf " %s %-8s %s\n" env CFLAGS "$(CFLAGS)" + @test -z "$(CPPFLAGS)" || printf " %s %-8s %s\n" env CPPFLAGS "$(CPPFLAGS)" + @test -z "$(LDADD)" || printf " %s %-8s %s\n" env LDADD "$(LDADD)" + @test -z "$(LIBADD)" || printf " %s %-8s %s\n" env LIBADD "$(LIBADD)" + @test -z "$(LDFLAGS)" || printf " %s %-8s %s\n" env LDFLAGS "$(LDFLAGS)" # Dummy target to force Automake to make the distclean target depend on it distclean-local: diff --git a/camlibs/Makefile.am b/camlibs/Makefile.am index 01a289cfa0..92458f0f40 100644 --- a/camlibs/Makefile.am +++ b/camlibs/Makefile.am @@ -155,6 +155,19 @@ include tp6801/Makefile-files # End of list of Makefile-files +######################################################################## +# Print build flags for camlibs + +CLEANFILES += camlib-buildflags.stamp +noinst_DATA += camlib-buildflags.stamp +camlib-buildflags.stamp: $(camlib_LTLIBRARIES) + @test -z "$(camlib_cflags)" || printf " %s %-8s %s\n" cam CFLAGS "$(camlib_cflags)" + @test -z "$(camlib_cppflags)" || printf " %s %-8s %s\n" cam CPPFLAGS "$(camlib_cppflags)" + @test -z "$(camlib_libadd)" || printf " %s %-8s %s\n" cam LIBADD "$(camlib_libadd)" + @test -z "$(camlib_ldflags)" || printf " %s %-8s %s\n" cam LDFLAGS "$(camlib_ldflags)" + @date > $@ + + ######################################################################## # Print list of GP_CAMLIB() definitions suitable for adding to # configure.ac diff --git a/configure.ac b/configure.ac index 090b754851..c180ecc532 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ dnl libtool 2014-10-27 2.4.3 dnl libtool 2011-10-18 2.4.2 -AM_SILENT_RULES([no]) +AM_SILENT_RULES([yes]) dnl Flag all GP_ strings in result as error unless specifically allowed. diff --git a/doc/Makefile.am b/doc/Makefile.am index c4d35711a7..83364ed07e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -25,8 +25,8 @@ LOCAL_CLEAN = # FIXME: Depend on source files. DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp $(HTML_APIDOC_DIR).stamp: Doxyfile - doxygen Doxyfile - echo > $@ + $(AM_V_GEN)doxygen $$($(AM_V_P) || printf "%s" "-q") Doxyfile + @: > $@ $(HTML_APIDOC_DIR).tar.gz: $(HTML_APIDOC_DIR).stamp (cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@ diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am index a3328d56d8..87900e16f4 100644 --- a/libgphoto2/Makefile.am +++ b/libgphoto2/Makefile.am @@ -1,4 +1,6 @@ +CLEANFILES = EXTRA_DIST = +noinst_DATA = # included by all *.c files containing translated string literals as @@ -91,3 +93,13 @@ libgphoto2_la_SOURCES += gphoto2-setting.c libgphoto2_la_SOURCES += gphoto2-widget.c libgphoto2_la_DEPENDENCIES += $(top_srcdir)/gphoto2/gphoto2-version.h + + +CLEANFILES += libgphoto2-buildflags.stamp +noinst_DATA += libgphoto2-buildflags.stamp +libgphoto2-buildflags.stamp: libgphoto2.la + @test -z "$(libgphoto2_la_CFLAGS)" || printf " %s %-8s %s\n" lg2 CFLAGS "$(libgphoto2_la_CFLAGS)" + @test -z "$(libgphoto2_la_CPPFLAGS)" || printf " %s %-8s %s\n" lg2 CPPFLAGS "$(libgphoto2_la_CPPFLAGS)" + @test -z "$(libgphoto2_la_LIBADD)" || printf " %s %-8s %s\n" lg2 LIBADD "$(libgphoto2_la_LIBADD)" + @test -z "$(libgphoto2_la_LDFLAGS)" || printf " %s %-8s %s\n" lg2 LDFLAGS "$(libgphoto2_la_LDFLAGS)" + @date > $@ diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am index 8f783057fb..0b50c1ceaa 100644 --- a/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/Makefile.am @@ -105,3 +105,13 @@ nobase_include_HEADERS = \ EXTRA_DIST += gphoto2/gphoto2-port-library.h EXTRA_DIST += gphoto2/gphoto2-port-locking.h + + +CLEANFILES += iolib-buildflags.stamp +noinst_DATA += iolib-buildflags.stamp +iolib-buildflags.stamp: $(iolib_LTLIBRARIES) + @test -z "$(iolib_cflags)" || printf " %s %-8s %s\n" iol CFLAGS "$(iolib_cflags)" + @test -z "$(iolib_cppflags)" || printf " %s %-8s %s\n" iol CPPFLAGS "$(iolib_cppflags)" + @test -z "$(iolib_libadd)" || printf " %s %-8s %s\n" iol LIBADD "$(iolib_libadd)" + @test -z "$(iolib_ldflags)" || printf " %s %-8s %s\n" iol LDFLAGS "$(iolib_ldflags)" + @date > $@ diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 9dd7fcbaac..4d28a9fad3 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -20,7 +20,7 @@ AM_INIT_AUTOMAKE([ ]) -AM_SILENT_RULES([no]) +AM_SILENT_RULES([yes]) AC_LANG([C]) diff --git a/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 b/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 index 49b8c7af26..cf3c42e5bc 100644 --- a/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 +++ b/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 @@ -57,21 +57,20 @@ dnl if the consistency check has been successful, and have "make all" abort dnl Error: Inconsistent values for GETTEXT_PACKAGE_LIBGPHOTO2 and po/Makevars DOMAIN. dnl if the consistency check has failed. dnl +m4_pattern_allow([AM_V_P])dnl cat >>${GP_GETTEXT_SETUP_MK} < $@