Fix "make dist".

Fixes #4489

diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am
index 0043d6ef55f0d4fd891c2290da5add20386ffc99..600edef7016a32e05111f8a557598759ada0fda9 100644 (file)
--- 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 2d4134b0fafb9b66c227f6bb8d57c504230ef60a..cbdb0bd7bd4b44fa0797d11364d224506e934e68 100644 (file)
--- 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 e20e46e9379563d907f99a819f99a444d56fe96b..b186c18f192c813331374b7a01063d7c3658e21c 100644 (file)
--- 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 7f5941e48803e86f8732b458f3daa2f261e27de4..c2389f1c53372d39701a1956eb6110894e96ada6 100644 (file)
--- 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 5c8b31cf787b6ce2ab9d4e355b6b536f3774a46e..6e493f89a1f43aa493f8aaea74482e45cd51dd37 100644 (file)
--- 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 8f2148f74c58715ff1ab7ae1662ad0a4c1320d12..60629b9e991c0c4730a32674a44aa3262a7f8d45 100644 (file)
--- 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 4d5011e6f25531ae69ba3e24417dd4a113621333..11864fa5c77fea9158b6ae29a507910760a5cbc9 100644 (file)
--- 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 de516b2821e437ba3a8efe317745e663dc140e73..baa490569413df85d26ca4af39e7f7a1a51c0ae9 100644 (file)
--- 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 07cf03f8299cdb19b06c2d44e2194cdbf392c063..1b1aedaa528ffb5edfdd6f68c6e72f5dbae86913 100644 (file)
--- 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 6df48fde11ff062fdec421544cb277a8c34a0fb7..a4ad7fd1a7ffedf10963bf081985c468bd2d3ef1 100644 (file)
--- 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 \