summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2006-03-05 19:52:51 +0000
committerMatthieu Herrb <matthieu.herrb@laas.fr>2006-03-05 19:52:51 +0000
commit6c8aba9e4c5211eec5829f2fe4c60103439355dd (patch)
tree88eafad806fa0515fd8deccc7482c3694b24b7dd
parent97ea84ce9da0e5aa8f98c008def6fcc20fd0f211 (diff)
Let BSD make find mkfontdir.cpp when building in a separate obj dir
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.am6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6eb4c51..7322bec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05 Matthieu Herrb <matthieu.herrb@laas.fr>
+ * Makefile.am:
+ Let BSD make find mkfontdir.cpp when building in a separate obj dir
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 33f4f5a..d848746 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,8 @@ bin_SCRIPTS = mkfontdir
appman_PRE = mkfontdir.man
-mkfontdir: mkfontdir.cpp
- $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
+.cpp:
+ $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < $< | $(SED) s/XCOMM/\#/ > $@
EXTRA_DIST = mkfontdir.cpp
CLEANFILES = $(bin_SCRIPTS)
@@ -55,7 +55,7 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@