diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-04-26 09:26:27 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2011-04-27 10:10:12 (GMT) |
commit | 38b678e4cb3e24882a7c37fe06040ff0c47775b1 (patch) | |
tree | a3d0b902c6dd30ddca39d5382a665be8c9bd9ced | |
parent | be90145227ca5cb9b54547ccb3905419f4d4f9d9 (diff) | |
download | fluxbox_paul-38b678e4cb3e24882a7c37fe06040ff0c47775b1.zip fluxbox_paul-38b678e4cb3e24882a7c37fe06040ff0c47775b1.tar.bz2 |
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
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | data/styles/BlueFlux/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/BlueFlux/pixmaps/Makefile.am | 2 | ||||
-rw-r--r-- | data/styles/Emerge/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/Emerge/pixmaps/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/Makefile.am | 8 | ||||
-rw-r--r-- | data/styles/arch/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/arch/pixmaps/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/bloe/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/bloe/pixmaps/Makefile.am | 2 | ||||
-rw-r--r-- | data/styles/bora_black/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/bora_blue/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/bora_green/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/carp/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/green_tea/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/ostrich/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/zimek_bisque/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/zimek_darkblue/Makefile.am | 3 | ||||
-rw-r--r-- | data/styles/zimek_green/Makefile.am | 3 | ||||
-rw-r--r-- | src/Makefile.am | 4 |
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 | |||
8 | ACLOCAL_AMFLAGS = -I . | 8 | ACLOCAL_AMFLAGS = -I . |
9 | EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/* | 9 | EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/* |
10 | 10 | ||
11 | uninstall-local: | 11 | uninstall-hook: |
12 | rmdir $(pkgdatadir) | 12 | rmdir $(DESTDIR)$(pkgdatadir) |
13 | distclean-local: | 13 | distclean-local: |
14 | rm -f *\~ | 14 | rm -f *\~ |
15 | 15 | ||
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 | |||
2 | styledir = $(pkgdatadir)/styles/BlueFlux | 2 | styledir = $(pkgdatadir)/styles/BlueFlux |
3 | 3 | ||
4 | style_DATA = theme.cfg | 4 | style_DATA = theme.cfg |
5 | EXTRA_DIST=$(style_DATA) | 5 | |
6 | 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 \ | |||
8 | button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \ | 8 | button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \ |
9 | title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm | 9 | title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm |
10 | 10 | ||
11 | EXTRA_DIST=$(style_DATA) | 11 | 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 | |||
2 | styledir = $(pkgdatadir)/styles/Emerge | 2 | styledir = $(pkgdatadir)/styles/Emerge |
3 | 3 | ||
4 | style_DATA = theme.cfg | 4 | style_DATA = theme.cfg |
5 | EXTRA_DIST=$(style_DATA) | 5 | |
6 | 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 \ | |||
4 | stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \ | 4 | stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \ |
5 | selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \ | 5 | selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \ |
6 | max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm | 6 | max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm |
7 | EXTRA_DIST=$(style_DATA) | 7 | |
8 | 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 \ | |||
3 | arch carp ostrich green_tea bloe | 3 | arch carp ostrich green_tea bloe |
4 | 4 | ||
5 | styledir = $(pkgdatadir)/styles | 5 | styledir = $(pkgdatadir)/styles |
6 | MAINTAINERCLEANFILES = Makefile.in | ||
7 | 6 | ||
8 | style_DATA = Makro MerleyKay Artwiz Flux \ | 7 | style_DATA = Makro MerleyKay Artwiz Flux \ |
9 | Nyz Operation Outcomes Results Shade LemonSpace \ | 8 | Nyz Operation Outcomes Results Shade LemonSpace \ |
10 | Twice qnx-photon BlueNight Meta | 9 | Twice qnx-photon BlueNight Meta |
11 | 10 | ||
12 | EXTRA_DIST=$(style_DATA) | 11 | include Makefile.include |
13 | |||
14 | uninstall-local: | ||
15 | rmdir $(styledir) | ||
16 | distclean-local: | ||
17 | rm -f *\~ | ||
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 | |||
2 | styledir = $(pkgdatadir)/styles/arch | 2 | styledir = $(pkgdatadir)/styles/arch |
3 | 3 | ||
4 | style_DATA = theme.cfg | 4 | style_DATA = theme.cfg |
5 | EXTRA_DIST=$(style_DATA) | 5 | |
6 | 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 \ | |||
8 | frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \ | 8 | frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \ |
9 | stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm | 9 | stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm |
10 | 10 | ||
11 | EXTRA_DIST=$(style_DATA) | 11 | |
12 | 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 | |||
2 | styledir = $(pkgdatadir)/styles/bloe | 2 | styledir = $(pkgdatadir)/styles/bloe |
3 | 3 | ||
4 | style_DATA = theme.cfg | 4 | style_DATA = theme.cfg |
5 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 5 | |
6 | 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 \ | |||
10 | stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \ | 10 | stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \ |
11 | unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm | 11 | unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm |
12 | 12 | ||
13 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 13 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/bora_black | 1 | styledir = $(pkgdatadir)/styles/bora_black |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/bora_blue | 1 | styledir = $(pkgdatadir)/styles/bora_blue |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/bora_green | 1 | styledir = $(pkgdatadir)/styles/bora_green |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/carp | 1 | styledir = $(pkgdatadir)/styles/carp |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/green_tea | 1 | styledir = $(pkgdatadir)/styles/green_tea |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/ostrich | 1 | styledir = $(pkgdatadir)/styles/ostrich |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/zimek_bisque | 1 | styledir = $(pkgdatadir)/styles/zimek_bisque |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/zimek_darkblue | 1 | styledir = $(pkgdatadir)/styles/zimek_darkblue |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) | 4 | |
5 | 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 @@ | |||
1 | styledir = $(pkgdatadir)/styles/zimek_green | 1 | styledir = $(pkgdatadir)/styles/zimek_green |
2 | 2 | ||
3 | style_DATA = theme.cfg | 3 | style_DATA = theme.cfg |
4 | EXTRA_DIST=$(style_DATA) \ No newline at end of file | 4 | |
5 | 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@ | |||
37 | AM_CPPFLAGS= | 37 | AM_CPPFLAGS= |
38 | 38 | ||
39 | bin_PROGRAMS= fluxbox | 39 | bin_PROGRAMS= fluxbox |
40 | BUILT_SOURCES = defaults.hh | 40 | BUILT_SOURCES = defaults.hh defaults.cc |
41 | CONFIG_CLEAN_FILES = defaults.hh | 41 | CONFIG_CLEAN_FILES = defaults.hh defaults.cc |
42 | defaults.hh: Makefile | 42 | defaults.hh: Makefile |
43 | @( \ | 43 | @( \ |
44 | echo '// This file is generated from Makefile. Do not edit!'; \ | 44 | echo '// This file is generated from Makefile. Do not edit!'; \ |