summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-09-17 07:34:46 +0200
committerDanny Baumann <dannybaumann@web.de>2008-09-17 07:34:46 +0200
commit56b240433396e01c6742534c1ea12d0309e4a139 (patch)
treef4226888634b14e1c689231f00238ae59b31d2c9
parent987935efb0c6df0371fdd8cc8b0ed0f7db13034d (diff)
Make sure kwinadaptor.h is built before it's used in the source.
-rw-r--r--kde/window-decorator-kde4/Makefile.am11
1 files changed, 6 insertions, 5 deletions
diff --git a/kde/window-decorator-kde4/Makefile.am b/kde/window-decorator-kde4/Makefile.am
index b8a5b72e..3062897d 100644
--- a/kde/window-decorator-kde4/Makefile.am
+++ b/kde/window-decorator-kde4/Makefile.am
@@ -13,6 +13,9 @@ kde4_window_decorator_LDADD = \
$(top_builddir)/libdecoration/libdecoration.la \
@KDE4_WINDOW_DECORATOR_LIBS@ @KDE4_LIBS@
+nodist_kde4_window_decorator_SOURCES = \
+ $(BUILDSOURCES)
+
dist_kde4_window_decorator_SOURCES = \
main.cpp \
utils.cpp \
@@ -29,17 +32,12 @@ dist_kde4_window_decorator_SOURCES = \
switcher.h \
org.kde.KWin.xml
-
-nodist_kde4_window_decorator_SOURCES = \
- $(BUILDSOURCES)
-
kde4_window_decorator_program = kde4-window-decorator
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @KDE4_WINDOW_DECORATOR_CFLAGS@ @KDE4_CFLAGS@
bin_PROGRAMS = $(kde4_window_decorator_program)
-
%.moc.cpp: %.h
$(QT4_MOC) $< > $@
@@ -48,6 +46,9 @@ kwinadaptor.h: kwinadaptor.cpp
kwinadaptor.cpp: org.kde.KWin.xml
$(QDBUSXML2CPP) -a kwinadaptor -i decorator.h -l KWD::Decorator $<
+# make sure kwinadaptor.h is built before any of the dist_SOURCES uses it
+main.cpp: kwinadaptor.h
+
CLEANFILES = $(BUILDSOURCES)
EXTRA_DIST = org.kde.KWin.xml