While they are still perfectly supported in mainline Automake, they would make a transition to Automake-NG harder.
* packages/glib/Makefile.am (nodist_gst_glib_la_SOURCES): Don't list 'libs.def' here. There's no need to, because it is already generated early (being listed in BUILT_SOURCES), and its role as a prerequisite is already computed automatically by the automatic dependency tracking code. More importantly, Automake-NG does not blindly treat source files with a custom unknown user extension as if they were header files anymore, so the presence of 'libs.def' here would cause spurious errors. * packages/gtk/Makefile.am: Likewise (with 'nodist_gst_gtk_la_SOURCES' in place of 'nodist_gst_glib_la_SOURCES'). Signed-off-by: Stefano Lattarini <[email protected]> --- ChangeLog | 18 ++++++++++++++++++ packages/glib/Makefile.am | 1 - packages/gtk/Makefile.am | 1 - 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 733c110..426b934 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2012-08-20 Stefano Lattarini <[email protected]> + build: don't use files with non-standard extensions in _SOURCES + + While they are still perfectly supported in mainline Automake, they + would make a transition to Automake-NG harder. + + * packages/glib/Makefile.am (nodist_gst_glib_la_SOURCES): Don't list + 'libs.def' here. There's no need to, because it is already generated + early (being listed in BUILT_SOURCES), and its role as a prerequisite + is already computed automatically by the automatic dependency tracking + code. More importantly, Automake-NG does not blindly treat source + files with a custom unknown user extension as if they were header + files anymore, so the presence of 'libs.def' here would cause spurious + errors. + * packages/gtk/Makefile.am: Likewise (with 'nodist_gst_gtk_la_SOURCES' + in place of 'nodist_gst_glib_la_SOURCES'). + +2012-08-20 Stefano Lattarini <[email protected]> + build: prefer pattern rules over suffix rules They are clearer and more idiomatic. Of course they are not diff --git a/packages/glib/Makefile.am b/packages/glib/Makefile.am index b8075f6..ae340af 100644 --- a/packages/glib/Makefile.am +++ b/packages/glib/Makefile.am @@ -16,7 +16,6 @@ gst_glib_la_LDFLAGS = $(gst_module_ldflags) gst_glib_la_LIBADD = $(ALL_LIBS) libgst-gobject.la ../../lib-src/library.la gst_glib_la_DEPENDENCIES = libgst-gobject.la dist_gst_glib_la_SOURCES = gst-glib.c -nodist_gst_glib_la_SOURCES = libs.def BUILT_SOURCES = libs.def # Work around bug in Automake (or is it Libtool?) The gst-glib library is diff --git a/packages/gtk/Makefile.am b/packages/gtk/Makefile.am index c136f38..1d32719 100644 --- a/packages/gtk/Makefile.am +++ b/packages/gtk/Makefile.am @@ -21,7 +21,6 @@ moduleexec_LTLIBRARIES = gst-gtk.la gst_gtk_la_LDFLAGS = $(gst_module_ldflags) gst_gtk_la_LIBADD = $(ALL_LIBS) ../glib/libgst-gobject.la dist_gst_gtk_la_SOURCES = gst-gtk.c placer.c -nodist_gst_gtk_la_SOURCES = libs.def BUILT_SOURCES = libs.def dist_noinst_HEADERS = placer.h -- 1.7.12.rc0.129.g61b472e _______________________________________________ help-smalltalk mailing list [email protected] https://lists.gnu.org/mailman/listinfo/help-smalltalk
