diff options
-rw-r--r-- | gtk/gnome/Makefile.am | 2 | ||||
-rw-r--r-- | gtk/window-decorator/Makefile.am | 1 | ||||
-rw-r--r-- | kde/window-decorator-kde4/Makefile.am | 11 | ||||
-rw-r--r-- | kde/window-decorator/Makefile.am | 6 | ||||
-rw-r--r-- | metadata/Makefile.am | 6 |
5 files changed, 12 insertions, 14 deletions
diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am index b9dcd869..dacd336b 100644 --- a/gtk/gnome/Makefile.am +++ b/gtk/gnome/Makefile.am @@ -73,9 +73,7 @@ noinst_DATA = \ $(xml_files) EXTRA_DIST = \ - $(desktopfiles_files) \ $(desktopfiles_in_files) \ - $(xml_files) \ $(xml_in_files) DISTCLEANFILES = \ diff --git a/gtk/window-decorator/Makefile.am b/gtk/window-decorator/Makefile.am index 51ae8153..762168fe 100644 --- a/gtk/window-decorator/Makefile.am +++ b/gtk/window-decorator/Makefile.am @@ -44,7 +44,6 @@ INCLUDES = \ bin_PROGRAMS = $(gtk_window_decorator_program) EXTRA_DIST = \ - $(schema_files) \ $(schema_in_files) DISTCLEANFILES = \ diff --git a/kde/window-decorator-kde4/Makefile.am b/kde/window-decorator-kde4/Makefile.am index ba7504a8..b8a5b72e 100644 --- a/kde/window-decorator-kde4/Makefile.am +++ b/kde/window-decorator-kde4/Makefile.am @@ -12,8 +12,8 @@ kde4_window_decorator_DEPENDENCIES = \ kde4_window_decorator_LDADD = \ $(top_builddir)/libdecoration/libdecoration.la \ @KDE4_WINDOW_DECORATOR_LIBS@ @KDE4_LIBS@ -kde4_window_decorator_SOURCES = \ - $(BUILDSOURCES) \ + +dist_kde4_window_decorator_SOURCES = \ main.cpp \ utils.cpp \ utils.h \ @@ -29,12 +29,17 @@ 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) $< > $@ @@ -44,6 +49,6 @@ kwinadaptor.cpp: org.kde.KWin.xml $(QDBUSXML2CPP) -a kwinadaptor -i decorator.h -l KWD::Decorator $< CLEANFILES = $(BUILDSOURCES) -EXTRA_DIST = $(BUILDSOURCES) +EXTRA_DIST = org.kde.KWin.xml endif diff --git a/kde/window-decorator/Makefile.am b/kde/window-decorator/Makefile.am index 9e4b303c..e6ed8a4d 100644 --- a/kde/window-decorator/Makefile.am +++ b/kde/window-decorator/Makefile.am @@ -10,8 +10,7 @@ kde_window_decorator_DEPENDENCIES = \ kde_window_decorator_LDADD = \ $(top_builddir)/libdecoration/libdecoration.la \ @KDE_WINDOW_DECORATOR_LIBS@ @KDE_LIBS@ -kde_window_decorator_SOURCES = \ - $(BUILDSOURCES) \ +dist_kde_window_decorator_SOURCES = \ main.cpp \ utils.cpp \ utils.h \ @@ -23,6 +22,8 @@ kde_window_decorator_SOURCES = \ options.h \ KWinInterface.h +nodist_kde_window_decorator_SOURCES = $(BUILDSOURCES) + kde_window_decorator_program = kde-window-decorator INCLUDES = -I$(top_srcdir)/include @KDE_WINDOW_DECORATOR_CFLAGS@ @KDE_CFLAGS@ @@ -39,6 +40,5 @@ bin_PROGRAMS = $(kde_window_decorator_program) $(DCOPIDL2CPP) $< > $@ CLEANFILES = $(BUILDSOURCES) KWinInterface_skel.* KWinInterface_stub.* -EXTRA_DIST = $(BUILDSOURCES) endif diff --git a/metadata/Makefile.am b/metadata/Makefile.am index 970bdfb8..666d9898 100644 --- a/metadata/Makefile.am +++ b/metadata/Makefile.am @@ -115,12 +115,8 @@ xslt_files = \ xslt_DATA = $(xslt_files) EXTRA_DIST = \ - $(xml_files) \ $(xml_in_files) \ - $(xslt_files) \ - $(schema_files) \ - $(kde_kcfg_files) \ - $(kde_config_files) + $(xslt_files) DISTCLEANFILES = \ $(xml_files) \ |