all repos — fluxbox @ 38b678e4cb3e24882a7c37fe06040ff0c47775b1

custom fork of the fluxbox windowmanager 

Make sure `make distcheck' is successful

- added rmdir commands to uninstall rules of all Makefiles under data/styles
- added \n at the end of files which had none
Pavel Labath pavelo@centrum.sk
commit

38b678e4cb3e24882a7c37fe06040ff0c47775b1

parent

be90145227ca5cb9b54547ccb3905419f4d4f9d9

20 files changed, 37 insertions(+), 28 deletions(-)

jump to
M Makefile.am → 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 *\~
M data/styles/BlueFlux/Makefile.am → 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
M data/styles/BlueFlux/pixmaps/Makefile.am → data/styles/BlueFlux/pixmaps/Makefile.am 
@@ -8,4 +8,4 @@ button_stick_unfocus.xpm button_stuck.xpm button_stuck_unfocus.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
M data/styles/Emerge/Makefile.am → 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
M data/styles/Emerge/pixmaps/Makefile.am → 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
M data/styles/Makefile.am → data/styles/Makefile.am 
@@ -3,15 +3,9 @@ zimek_bisque zimek_darkblue zimek_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
M data/styles/arch/Makefile.am → 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
M data/styles/arch/pixmaps/Makefile.am → data/styles/arch/pixmaps/Makefile.am 
@@ -8,4 +8,5 @@ stickufcs.xpm tbarfcs.xpm unshadefcs.xpm closefcs.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
M data/styles/bloe/Makefile.am → data/styles/bloe/Makefile.am 
@@ -2,4 +2,5 @@ SUBDIRS=pixmaps
 styledir = $(pkgdatadir)/styles/bloe
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)+
+include ../Makefile.include
M data/styles/bloe/pixmaps/Makefile.am → data/styles/bloe/pixmaps/Makefile.am 
@@ -10,4 +10,4 @@ minpr.xpm selected.xpm shadepr.xpm stickfcs.xpm \
 	stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \
 	unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm
 
-EXTRA_DIST=$(style_DATA)+include ../../Makefile.include
M data/styles/bora_black/Makefile.am → 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
M data/styles/bora_blue/Makefile.am → 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
M data/styles/bora_green/Makefile.am → 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
M data/styles/carp/Makefile.am → data/styles/carp/Makefile.am 
@@ -1,4 +1,5 @@ 
 styledir = $(pkgdatadir)/styles/carp
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)+
+include ../Makefile.include
M data/styles/green_tea/Makefile.am → data/styles/green_tea/Makefile.am 
@@ -1,4 +1,5 @@ 
 styledir = $(pkgdatadir)/styles/green_tea
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)+
+include ../Makefile.include
M data/styles/ostrich/Makefile.am → data/styles/ostrich/Makefile.am 
@@ -1,4 +1,5 @@ 
 styledir = $(pkgdatadir)/styles/ostrich
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)+
+include ../Makefile.include
M data/styles/zimek_bisque/Makefile.am → data/styles/zimek_bisque/Makefile.am 
@@ -1,4 +1,5 @@ 
 styledir = $(pkgdatadir)/styles/zimek_bisque
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)+
+include ../Makefile.include
M data/styles/zimek_darkblue/Makefile.am → 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
M data/styles/zimek_green/Makefile.am → data/styles/zimek_green/Makefile.am 
@@ -1,4 +1,5 @@ 
 styledir = $(pkgdatadir)/styles/zimek_green
 
 style_DATA = theme.cfg
-EXTRA_DIST=$(style_DATA)+
+include ../Makefile.include
M src/Makefile.am → src/Makefile.am 
@@ -37,8 +37,8 @@ 
 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!'; \