summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-30 20:33:05 (GMT)
committerfluxgen <fluxgen>2003-06-30 20:33:05 (GMT)
commitcbcc6401c6a87623f8cf714cd699db3b63079915 (patch)
tree0b70954ec42328d4d02cd97df9158383f370861f
parentaa7f88e27a8ff77296c0ec016654be66d36f342a (diff)
downloadfluxbox_lack-cbcc6401c6a87623f8cf714cd699db3b63079915.zip
fluxbox_lack-cbcc6401c6a87623f8cf714cd699db3b63079915.tar.bz2
cleaner compile, default defines in generated defaults.hh file now
-rw-r--r--src/Makefile.am20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 412a2e8..b4c4ce8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,16 +29,22 @@ DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
29DEFAULT_KEYSFILE=$(pkgdatadir)/keys 29DEFAULT_KEYSFILE=$(pkgdatadir)/keys
30DEFAULT_INITFILE= 30DEFAULT_INITFILE=
31 31
32AM_CPPFLAGS= -Wall @CPPFLAGS@ \ 32AM_CPPFLAGS= -Wall @CPPFLAGS@ -IFbTk
33-DLOCALEPATH=\"$(pkgdatadir)/nls\" \
34-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
35-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
36-DDEFAULTKEYSFILE=\"$(DEFAULT_KEYSFILE)\"\
37-DDEFAULT_INITFILE=\"$(pkgdatadir)/init\"\
38-IFbTk
39 33
40bin_PROGRAMS= fluxbox 34bin_PROGRAMS= fluxbox
35BUILT_SOURCES = defaults.hh
36defaults.hh: Makefile
37 echo '// This file is generated from makefile. Do not edit!' > defaults.hh
38 echo '#define DEFAULTMENU "$(DEFAULTMENU)"' >> defaults.hh
39 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
40 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
41 echo '#define DEFAULT_INITFILE "$(pkgdatadir)/init"' >> defaults.hh
42 echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
41 43
44# some extra deps for I18n and fluxbox
45
46I18n.$(OBJEXT): defaults.hh
47fluxbox.$(OBJEXT): defaults.hh
42 48
43if NEWWMSPEC 49if NEWWMSPEC
44newwmspec_SOURCE= Ewmh.hh Ewmh.cc 50newwmspec_SOURCE= Ewmh.hh Ewmh.cc