tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/make-dist-4976' into next 

Fixes #4976
This commit is contained in:
Gunnar Beutner 2013-10-30 12:20:46 +01:00
parent e0ae1df268 dc21088680
commit 9ddd14e0fe
11 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/checker/Makefile.am
View File

@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
BUILT_SOURCES = \
checkercomponent.th
nodist_libchecker_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
checker-type.cpp
@ -13,12 +15,12 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libchecker_la_SOURCES = \
checkercomponent.cpp \
checkercomponent.h \
checkercomponent.th \
checkercomponent.ti \
checker-type.conf
libchecker_la_CPPFLAGS = \

4
components/cluster/Makefile.am
View File

@ -7,6 +7,8 @@ BUILT_SOURCES = \
clusterlistener.th \
endpoint.th
nodist_libcluster_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
cluster-type.cpp
@ -14,7 +16,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libcluster_la_SOURCES = \
clusterlistener.cpp \

12
components/compat/Makefile.am
View File

@ -9,6 +9,8 @@ BUILT_SOURCES = \
statusdatawriter.th \
compatlogger.th
nodist_libcompat_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
compat-type.cpp
@ -16,21 +18,21 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libcompat_la_SOURCES = \
checkresultreader.cpp \
checkresultreader.h \
checkresultreader.th \
checkresultreader.ti \
externalcommandlistener.cpp \
externalcommandlistener.h \
externalcommandlistener.th \
externalcommandlistener.ti \
statusdatawriter.cpp \
statusdatawriter.h \
statusdatawriter.th \
statusdatawriter.ti \
compatlogger.cpp \
compatlogger.h \
compatlogger.th \
compatlogger.ti \
compat-type.conf
libcompat_la_CPPFLAGS = \

4
components/db_ido_mysql/Makefile.am
View File

@ -11,6 +11,8 @@ pkglib_LTLIBRARIES = \
BUILT_SOURCES = \
idomysqlconnection.th
nodist_libdb_ido_mysql_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
db_ido_mysql-type.cpp
@ -18,7 +20,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libdb_ido_mysql_la_SOURCES = \
db_ido_mysql-type.conf \

4
components/demo/Makefile.am
View File

@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
BUILT_SOURCES = \
demo.th
nodist_libdemo_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
demo-type.cpp
@ -13,7 +15,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libdemo_la_SOURCES = \
demo.cpp \

4
components/livestatus/Makefile.am
View File

@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
BUILT_SOURCES = \
listener.th
nodist_liblivestatus_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
livestatus-type.cpp
@ -13,7 +15,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
liblivestatus_la_SOURCES = \
aggregator.cpp \

4
components/notification/Makefile.am
View File

@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
BUILT_SOURCES = \
notificationcomponent.th
nodist_libnotification_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
notification-type.cpp
@ -13,7 +15,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libnotification_la_SOURCES = \
notificationcomponent.cpp \

6
components/perfdata/Makefile.am
View File

@ -8,6 +8,8 @@ BUILT_SOURCES = \
graphitewriter.th \
perfdatawriter.th
nodist_libperfdata_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
perfdata-type.cpp
@ -15,7 +17,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libperfdata_la_SOURCES = \
graphitewriter.cpp \
@ -23,7 +25,7 @@ libperfdata_la_SOURCES = \
graphitewriter.ti \
perfdatawriter.cpp \
perfdatawriter.h \
perfdatawriter.th \
perfdatawriter.ti \
perfdata-type.conf
libperfdata_la_CPPFLAGS = \

4
lib/base/Makefile.am
View File

@ -14,8 +14,10 @@ BUILT_SOURCES = \
streamlogger.th \
sysloglogger.th
nodist_libbase_la_SOURCES = $(BUILT_SOURCES)
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libbase_la_SOURCES = \
application.cpp \

2
lib/db_ido/Makefile.am
View File

@ -13,7 +13,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libdb_ido_la_SOURCES = \
commanddbobject.cpp \

4
lib/icinga/Makefile.am
View File

@ -20,6 +20,8 @@ BUILT_SOURCES = \
user.th \
usergroup.th
nodist_libicinga_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \
icinga-type.cpp
@ -27,7 +29,7 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
.ti.th: $(top_builddir)/tools/mkclass/mkclass
$(top_builddir)/tools/mkclass/mkclass $< > $@
$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
libicinga_la_SOURCES = \
api.cpp \