projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5cc0ad4
)
Smake give correct dependencies where they are well defined
author
John Darrington
<john@darrington.wattle.id.au>
Fri, 23 Sep 2011 12:29:40 +0000
(14:29 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Mon, 26 Sep 2011 16:38:03 +0000
(18:38 +0200)
Smake
patch
|
blob
|
history
diff --git
a/Smake
b/Smake
index acd93102be0632c517e739bfa116cbe2c8e5a5eb..61235efd90c19a39113e1c85633fddb6befe1975 100644
(file)
--- a/
Smake
+++ b/
Smake
@@
-108,22
+108,31
@@
GNULIB_MODULES = \
xstrndup \
xvasprintf
xstrndup \
xvasprintf
-all:
+all: prep_ph
+ $(MAKE) -f Smake Makefile.in configure
+
+.PHONY: prep_ph
+prep_ph:
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
touch m4/Makefile.am
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
touch m4/Makefile.am
- $(MAKE) -f Smake gnulib
+ $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
+ --source-base=gl --lib=libgl --tests-base=tests \
+ --doc-base=gl/doc --aux-dir=build-aux \
+ --libtool $(GNULIB_MODULES)
libtoolize --force --automake
libtoolize --force --automake
+
+aclocal.m4:
aclocal -I m4 -I gl/m4
aclocal -I m4 -I gl/m4
+
+configure: configure.ac aclocal.m4
autoconf
autoconf
+
+config.h.in: configure.ac
autoheader
autoheader
- automake --add-missing --copy --no-force
-gnulib:
- $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
- --source-base=gl --lib=libgl --tests-base=tests \
- --doc-base=gl/doc --aux-dir=build-aux --import \
- --libtool $(GNULIB_MODULES)
+Makefile.in: Makefile.am config.h.in aclocal.m4
+ automake --add-missing --copy --no-force --include-deps
gettextize:
gettextize: