20 files changed, 37 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index b0c5dfb..136824f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 ACLOCAL_AMFLAGS = -I .
 EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/*
 
-uninstall-local:
-        rmdir $(pkgdatadir)
+uninstall-hook:
+        rmdir $(DESTDIR)$(pkgdatadir)
 distclean-local:
         rm -f *\~
 
diff --git a/data/styles/BlueFlux/Makefile.am b/data/styles/BlueFlux/Makefile.am
index a33eafa..86965dc 100644
--- a/data/styles/BlueFlux/Makefile.am
+++ b/data/styles/BlueFlux/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS=pixmaps
 styledir = $(pkgdatadir)/styles/BlueFlux
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/BlueFlux/pixmaps/Makefile.am b/data/styles/BlueFlux/pixmaps/Makefile.am
index 2d658e0..a247c5a 100644
--- a/data/styles/BlueFlux/pixmaps/Makefile.am
+++ b/data/styles/BlueFlux/pixmaps/Makefile.am
@@ -8,4 +8,4 @@ style_DATA = button_close_active.xpm button_close_pressed.xpm \
         button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \
         title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm
 
-EXTRA_DIST=$(style_DATA)
+include ../../Makefile.include
diff --git a/data/styles/Emerge/Makefile.am b/data/styles/Emerge/Makefile.am
index 5c01b44..4054bd7 100644
--- a/data/styles/Emerge/Makefile.am
+++ b/data/styles/Emerge/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS=pixmaps
 styledir = $(pkgdatadir)/styles/Emerge
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/Emerge/pixmaps/Makefile.am b/data/styles/Emerge/pixmaps/Makefile.am
index 70262ce..4165e1c 100644
--- a/data/styles/Emerge/pixmaps/Makefile.am
+++ b/data/styles/Emerge/pixmaps/Makefile.am
@@ -4,4 +4,5 @@ style_DATA = bullet.xpm close.xpm icon.xpm max.xpm stick-unfocus.xpm \
         stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \
         selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \
     max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm
-EXTRA_DIST=$(style_DATA)
+
+include ../../Makefile.include
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
index 702960f..997aac5 100644
--- a/data/styles/Makefile.am
+++ b/data/styles/Makefile.am
@@ -3,15 +3,9 @@ SUBDIRS=Emerge BlueFlux bora_black bora_blue bora_green \
         arch carp ostrich green_tea bloe
 
 styledir = $(pkgdatadir)/styles
-MAINTAINERCLEANFILES = Makefile.in
 
 style_DATA = Makro MerleyKay Artwiz Flux \
         Nyz Operation Outcomes Results Shade LemonSpace \
         Twice qnx-photon BlueNight Meta
 
-EXTRA_DIST=$(style_DATA)
-
-uninstall-local:
-        rmdir $(styledir)
-distclean-local:
-        rm -f *\~
+include Makefile.include
diff --git a/data/styles/arch/Makefile.am b/data/styles/arch/Makefile.am
index 2f04b7f..bc1aafa 100644
--- a/data/styles/arch/Makefile.am
+++ b/data/styles/arch/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS=pixmaps
 styledir = $(pkgdatadir)/styles/arch
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/arch/pixmaps/Makefile.am b/data/styles/arch/pixmaps/Makefile.am
index f9e7501..fb94c36 100644
--- a/data/styles/arch/pixmaps/Makefile.am
+++ b/data/styles/arch/pixmaps/Makefile.am
@@ -8,4 +8,5 @@ style_DATA = closepr.xpm gripfcs.xpm maxufcs.xpm menuiconufcs.xpm \
         frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \
          stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm
 
-EXTRA_DIST=$(style_DATA)
+
+include ../../Makefile.include
diff --git a/data/styles/bloe/Makefile.am b/data/styles/bloe/Makefile.am
index 0ca711a..ad574ba 100644
--- a/data/styles/bloe/Makefile.am
+++ b/data/styles/bloe/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS=pixmaps
 styledir = $(pkgdatadir)/styles/bloe
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+
+include ../Makefile.include
diff --git a/data/styles/bloe/pixmaps/Makefile.am b/data/styles/bloe/pixmaps/Makefile.am
index cbf7e8b..42226a0 100644
--- a/data/styles/bloe/pixmaps/Makefile.am
+++ b/data/styles/bloe/pixmaps/Makefile.am
@@ -10,4 +10,4 @@ style_DATA = bullet.xpm closepr.xpm frame.xpm maxfcs.xpm \
         stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \
         unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm
 
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+include ../../Makefile.include
diff --git a/data/styles/bora_black/Makefile.am b/data/styles/bora_black/Makefile.am
index ae55ba9..4cb9ffb 100644
--- a/data/styles/bora_black/Makefile.am
+++ b/data/styles/bora_black/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/bora_black
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/bora_blue/Makefile.am b/data/styles/bora_blue/Makefile.am
index 8c5d67e..c726064 100644
--- a/data/styles/bora_blue/Makefile.am
+++ b/data/styles/bora_blue/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/bora_blue
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/bora_green/Makefile.am b/data/styles/bora_green/Makefile.am
index 372e08a..37d47e1 100644
--- a/data/styles/bora_green/Makefile.am
+++ b/data/styles/bora_green/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/bora_green
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/carp/Makefile.am b/data/styles/carp/Makefile.am
index 2982984..3e31178 100644
--- a/data/styles/carp/Makefile.am
+++ b/data/styles/carp/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/carp
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+
+include ../Makefile.include
diff --git a/data/styles/green_tea/Makefile.am b/data/styles/green_tea/Makefile.am
index 95bf0f8..899e028 100644
--- a/data/styles/green_tea/Makefile.am
+++ b/data/styles/green_tea/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/green_tea
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+
+include ../Makefile.include
diff --git a/data/styles/ostrich/Makefile.am b/data/styles/ostrich/Makefile.am
index a143e2a..c9879c8 100644
--- a/data/styles/ostrich/Makefile.am
+++ b/data/styles/ostrich/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/ostrich
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+
+include ../Makefile.include
diff --git a/data/styles/zimek_bisque/Makefile.am b/data/styles/zimek_bisque/Makefile.am
index 0949272..9869bdf 100644
--- a/data/styles/zimek_bisque/Makefile.am
+++ b/data/styles/zimek_bisque/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/zimek_bisque
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+
+include ../Makefile.include
diff --git a/data/styles/zimek_darkblue/Makefile.am b/data/styles/zimek_darkblue/Makefile.am
index 7efb124..a84b7f4 100644
--- a/data/styles/zimek_darkblue/Makefile.am
+++ b/data/styles/zimek_darkblue/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/zimek_darkblue
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
+
+include ../Makefile.include
diff --git a/data/styles/zimek_green/Makefile.am b/data/styles/zimek_green/Makefile.am
index c4fe54d..43dbb82 100644
--- a/data/styles/zimek_green/Makefile.am
+++ b/data/styles/zimek_green/Makefile.am
@@ -1,4 +1,5 @@
 styledir = $(pkgdatadir)/styles/zimek_green
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)
\ No newline at end of file
+
+include ../Makefile.include
diff --git a/src/Makefile.am b/src/Makefile.am
index e60f9b4..12f86bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,8 +37,8 @@ PROGRAM_SUFFIX=@program_suffix@
 AM_CPPFLAGS=
 
 bin_PROGRAMS= fluxbox
-BUILT_SOURCES = defaults.hh
-CONFIG_CLEAN_FILES = defaults.hh
+BUILT_SOURCES = defaults.hh defaults.cc
+CONFIG_CLEAN_FILES = defaults.hh defaults.cc
 defaults.hh: Makefile
         @( \
                 echo '// This file is generated from Makefile. Do not edit!'; \