diff options
-rw-r--r-- | plugins/mate/Makefile.am | 33 | ||||
-rw-r--r-- | plugins/wimaxasncp/Makefile.am | 29 |
2 files changed, 24 insertions, 38 deletions
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 6313698f07..fe1cc4d6ad 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -24,38 +24,31 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc -noinst_LTLIBRARIES = mate-generated.la +# +# XXX - how to make this apply only to clean files? +# +#if HAVE_WARNINGS_AS_ERRORS +#AM_CFLAGS += -Werror +#endif plugin_LTLIBRARIES = mate.la -mate_generated_la_SOURCES = \ - $(FLEX_GENERATED_C_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) - -nodist_mate_generated_la_SOURCES = \ - $(LEMON_GENERATED_C_FILES) \ - $(LEMON_GENERATED_HEADER_FILES) - -mate_generated_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) - -mate_generated_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) - -mate_generated_la_LDFLAGS = $(PLUGIN_LDFLAGS) - mate_la_SOURCES = \ plugin.c \ moduleinfo.h \ - $(CLEAN_SRC_FILES) \ - $(CLEAN_HEADER_FILES) + $(SRC_FILES) \ + $(HEADER_FILES) + +nodist_mate_la_SOURCES = \ + $(NODIST_SRC_FILES) \ + $(NODIST_HEADER_FILES) mate_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) -mate_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) +mate_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) mate_la_LDFLAGS = $(PLUGIN_LDFLAGS) -mate_la_DEPENDENCIES = mate-generated.la - BUILT_SOURCES = \ $(LEMON_GENERATED_HEADER_FILES) diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 7e4cd206b3..e4f4cd7f2f 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -24,34 +24,27 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc -noinst_LTLIBRARIES = wimaxasncp-generated.la +# +# XXX - how to make this apply only to clean files? +# +#if HAVE_WARNINGS_AS_ERRORS +#AM_CFLAGS += -Werror +#endif plugin_LTLIBRARIES = wimaxasncp.la -wimaxasncp_generated_la_SOURCES = \ - $(FLEX_GENERATED_C_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) - -wimaxasncp_generated_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) - -wimaxasncp_generated_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) - -wimaxasncp_generated_la_LDFLAGS = $(PLUGIN_LDFLAGS) - wimaxasncp_la_SOURCES = \ - plugin.c \ - moduleinfo.h \ - $(CLEAN_SRC_FILES) \ - $(CLEAN_HEADER_FILES) + plugin.c \ + moduleinfo.h \ + $(SRC_FILES) \ + $(HEADER_FILES) wimaxasncp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) -wimaxasncp_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) +wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS) -wimaxasncp_la_DEPENDENCIES = wimaxasncp-generated.la - CLEANFILES = \ wimaxasncp \ *~ |