diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/Makefile.am | 24 |
2 files changed, 18 insertions, 10 deletions
@@ -1,5 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.13 | 2 | Changes for 0.9.13 |
3 | *05/04/07: | ||
4 | * Minor tweak for the buildsystem so it doesnt compile | ||
5 | defaults.cc every time (Mathias) | ||
6 | src/Makefile.am | ||
3 | *05/04/03: | 7 | *05/04/03: |
4 | * Tidy up some redundant pixmap allocations (Simon) | 8 | * Tidy up some redundant pixmap allocations (Simon) |
5 | Menu.cc TextButton.cc FbPixmap.hh | 9 | Menu.cc TextButton.cc FbPixmap.hh |
diff --git a/src/Makefile.am b/src/Makefile.am index eb81f3d..6631587 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -35,18 +35,22 @@ bin_PROGRAMS= fluxbox | |||
35 | BUILT_SOURCES = defaults.hh | 35 | BUILT_SOURCES = defaults.hh |
36 | CONFIG_CLEAN_FILES = defaults.hh | 36 | CONFIG_CLEAN_FILES = defaults.hh |
37 | defaults.hh: Makefile | 37 | defaults.hh: Makefile |
38 | echo '// This file is generated from makefile. Do not edit!' > defaults.hh | 38 | @( \ |
39 | echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh | 39 | echo '// This file is generated from Makefile. Do not edit!'; \ |
40 | echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh | 40 | echo '#define DEFAULTMENU "$(DEFAULT_MENU)"'; \ |
41 | echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh | 41 | echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \ |
42 | echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh | 42 | echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \ |
43 | echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh | 43 | echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \ |
44 | echo 'const char* svnversion(void);' >> defaults.hh | 44 | echo '#define LOCALEPATH "$(pkgdatadir)/nls"'; \ |
45 | echo 'const char* svnversion(void);' ) > defaults.hh | ||
45 | 46 | ||
46 | defaults.cc: force | 47 | defaults.cc: force |
47 | echo 'const char* svnversion(void) {' > defaults.cc | 48 | @( \ |
48 | echo ' return "'`(svnversion . | sed "s/[^0-9].*//") 2> /dev/null`'";' >> defaults.cc | 49 | echo 'const char* svnversion(void) {'; \ |
49 | echo '}' >> defaults.cc | 50 | echo ' return "'`(svnversion . | sed "s/[^0-9].*//") 2> /dev/null`'";';\ |
51 | echo '}' ) > defaults_tmp.cc | ||
52 | @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi | ||
53 | @rm defaults_tmp.cc | ||
50 | 54 | ||
51 | force: ; | 55 | force: ; |
52 | 56 | ||