From e93808a4682dbbb44d1ceda55deb8b670a664f3f Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 29 Aug 2013 08:37:31 +0200 Subject: [PATCH] Fix "make dist". Fixes #4489 --- components/checker/Makefile.am | 9 ++------- components/cluster/Makefile.am | 9 ++------- components/compat/Makefile.am | 9 ++------- components/demo/Makefile.am | 9 ++------- components/ido_mysql/Makefile.am | 9 ++------- components/livestatus/Makefile.am | 9 ++------- components/notification/Makefile.am | 9 ++------- lib/config/Makefile.am | 8 ++------ lib/icinga/Makefile.am | 9 ++------- lib/ido/Makefile.am | 9 ++------- 10 files changed, 20 insertions(+), 69 deletions(-) diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am index 0043d6ef5..600edef70 100644 --- a/components/checker/Makefile.am +++ b/components/checker/Makefile.am @@ -3,21 +3,16 @@ pkglib_LTLIBRARIES = \ libchecker.la -EXTRA_DIST = \ - checker-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ checker-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ libchecker_la_SOURCES = \ checkercomponent.cpp \ checkercomponent.h \ - checker-type.cpp + checker-type.conf libchecker_la_CPPFLAGS = \ $(LTDLINCL) \ diff --git a/components/cluster/Makefile.am b/components/cluster/Makefile.am index 2d4134b0f..cbdb0bd7b 100644 --- a/components/cluster/Makefile.am +++ b/components/cluster/Makefile.am @@ -3,21 +3,16 @@ pkglib_LTLIBRARIES = \ libcluster.la -EXTRA_DIST = \ - cluster-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ cluster-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ libcluster_la_SOURCES = \ clustercomponent.cpp \ clustercomponent.h \ - cluster-type.cpp \ + cluster-type.conf \ endpoint.cpp \ endpoint.h \ jsonrpc.cpp \ diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am index e20e46e93..b186c18f1 100644 --- a/components/compat/Makefile.am +++ b/components/compat/Makefile.am @@ -3,14 +3,9 @@ pkglib_LTLIBRARIES = \ libcompat.la -EXTRA_DIST = \ - compat-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ compat-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ @@ -21,7 +16,7 @@ libcompat_la_SOURCES = \ compatcomponent.h \ compatlog.cpp \ compatlog.h \ - compat-type.cpp + compat-type.conf libcompat_la_CPPFLAGS = \ $(LTDLINCL) \ diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am index 7f5941e48..c2389f1c5 100644 --- a/components/demo/Makefile.am +++ b/components/demo/Makefile.am @@ -3,21 +3,16 @@ pkglib_LTLIBRARIES = \ libdemo.la -EXTRA_DIST = \ - demo-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ demo-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ libdemo_la_SOURCES = \ democomponent.cpp \ democomponent.h \ - demo-type.cpp + demo-type.conf libdemo_la_CPPFLAGS = \ $(LTDLINCL) \ diff --git a/components/ido_mysql/Makefile.am b/components/ido_mysql/Makefile.am index 5c8b31cf7..6e493f89a 100644 --- a/components/ido_mysql/Makefile.am +++ b/components/ido_mysql/Makefile.am @@ -4,19 +4,14 @@ if MYSQL_USE pkglib_LTLIBRARIES = \ libido_mysql.la -EXTRA_DIST = \ - ido_mysql-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ ido_mysql-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ libido_mysql_la_SOURCES = \ - ido_mysql-type.cpp \ + ido_mysql-type.conf \ idomysqldbconnection.cpp \ idomysqldbconnection.h diff --git a/components/livestatus/Makefile.am b/components/livestatus/Makefile.am index 8f2148f74..60629b9e9 100644 --- a/components/livestatus/Makefile.am +++ b/components/livestatus/Makefile.am @@ -3,14 +3,9 @@ pkglib_LTLIBRARIES = \ liblivestatus.la -EXTRA_DIST = \ - livestatus-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ livestatus-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ @@ -51,7 +46,7 @@ liblivestatus_la_SOURCES = \ invavgaggregator.h \ invsumaggregator.cpp \ invsumaggregator.h \ - livestatus-type.cpp \ + livestatus-type.conf \ logtable.cpp \ logtable.h \ maxaggregator.cpp \ diff --git a/components/notification/Makefile.am b/components/notification/Makefile.am index 4d5011e6f..11864fa5c 100644 --- a/components/notification/Makefile.am +++ b/components/notification/Makefile.am @@ -3,21 +3,16 @@ pkglib_LTLIBRARIES = \ libnotification.la -EXTRA_DIST = \ - notification-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ notification-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ libnotification_la_SOURCES = \ notificationcomponent.cpp \ notificationcomponent.h \ - notification-type.cpp + notification-type.conf libnotification_la_CPPFLAGS = \ $(LTDLINCL) \ diff --git a/lib/config/Makefile.am b/lib/config/Makefile.am index de516b282..baa490569 100644 --- a/lib/config/Makefile.am +++ b/lib/config/Makefile.am @@ -5,22 +5,18 @@ pkglib_LTLIBRARIES = \ libconfig.la BUILT_SOURCES = \ - config_parser.h \ - base-type.cpp + config_parser.h CLEANFILES = \ base-type.cpp AM_YFLAGS = -d -EXTRA_DIST = \ - base-type.conf - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ libconfig_la_SOURCES = \ - base-type.cpp \ + base-type.conf \ configcompiler.cpp \ configcompiler.h \ configcompilercontext.cpp \ diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am index 07cf03f82..1b1aedaa5 100644 --- a/lib/icinga/Makefile.am +++ b/lib/icinga/Makefile.am @@ -4,14 +4,9 @@ pkglib_LTLIBRARIES = \ libicinga.la -EXTRA_DIST = \ - icinga-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ icinga-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ @@ -35,7 +30,7 @@ libicinga_la_SOURCES = \ hostgroup.h \ host.h \ i2-icinga.h \ - icinga-type.cpp \ + icinga-type.conf \ icingaapplication.cpp \ icingaapplication.h \ legacytimeperiod.cpp \ diff --git a/lib/ido/Makefile.am b/lib/ido/Makefile.am index 6df48fde1..a4ad7fd1a 100644 --- a/lib/ido/Makefile.am +++ b/lib/ido/Makefile.am @@ -3,14 +3,9 @@ pkglib_LTLIBRARIES = \ libido.la -EXTRA_DIST = \ - ido-type.conf - -BUILT_SOURCES = \ +CLEANFILES = \ ido-type.cpp -CLEANFILES = $(BUILT_SOURCES) - .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ @@ -33,7 +28,7 @@ libido_la_SOURCES = \ hostdbobject.h \ hostgroupdbobject.cpp \ hostgroupdbobject.h \ - ido-type.cpp \ + ido-type.conf \ servicedbobject.cpp \ servicedbobject.h \ servicegroupdbobject.cpp \ -- 2.40.0