Commit b7103478 authored by sebastien's avatar sebastien

trunk: build system updates

* top-level Makefile now generated
* automatic rules for regenerating configure and Makefiles
* enhanced source tarball creation (no longer destroys SVN subdirs)


git-svn-id: https://www.dynare.org/svn/dynare/trunk@2734 ac1d8469-bf42-47a9-8791-bf33cf982152
parent 4b9e7ca2
......@@ -15,16 +15,20 @@ clean:
distclean: clean
rm -f config.log config.status
rm -rf autom4te.cache
rm -f preprocessor/Makefile
rm -f Makefile preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile
.PHONY: distclean
DYNAREBASE=$(shell basename $(shell pwd))
TARBASENAME=@PACKAGE_NAME@-@PACKAGE_VERSION@
# Rule for creating the source tarball
# The parent directory must be called dynare-4.x.y
# WARNING: this rule will make your SVN working copy unusable!
srctarball: distclean
find -name .svn | xargs rm -rf
find -type f -name '*~' | xargs rm -f
cd ..; tar cvzf $(DYNAREBASE).tgz --exclude=tests $(DYNAREBASE)
srctarball $(TARBASENAME).tar.gz: distclean
tar cvzf ../$(TARBASENAME).tar.gz --transform 's,^\./,$(TARBASENAME)/,' --exclude='*~' --exclude-vcs .
.PHONY: srctarball
configure: configure.ac
autoconf
Makefile: Makefile.in config.status
./config.status
config.status: configure
./config.status --recheck
......@@ -3955,7 +3955,7 @@ $as_echo "$as_me: WARNING: The creation of the HTML version will be very slow! Y
fi
fi
ac_config_files="$ac_config_files preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile"
ac_config_files="$ac_config_files Makefile preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile"
cat >confcache <<\_ACEOF
......@@ -4566,6 +4566,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES preprocessor/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/preprocessor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/preprocessor/Makefile" ;;
......
......@@ -61,6 +61,6 @@ then
fi
fi
AC_CONFIG_FILES([preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile])
AC_CONFIG_FILES([Makefile preprocessor/Makefile doc/Makefile doc/preprocessor/Makefile doc/macroprocessor/Makefile doc/userguide/Makefile])
AC_OUTPUT
......@@ -37,3 +37,6 @@ clean:
make -C macroprocessor clean
make -C userguide clean
.PHONY: clean
Makefile: Makefile.in ../config.status
cd .. && ./config.status
......@@ -9,3 +9,6 @@ endif
clean:
rm -f macroprocessor.pdf *.toc *.aux *.log *.nav *.snm *.vrb *.out *~
.PHONY: clean
Makefile: Makefile.in ../../config.status
cd ../.. && ./config.status
......@@ -9,3 +9,6 @@ endif
clean:
rm -f *.pdf *.toc *.aux *.log *.nav *.snm *.vrb *.out *~
.PHONY: clean
Makefile: Makefile.in ../../config.status
cd ../.. && ./config.status
......@@ -22,3 +22,6 @@ clean:
rm -f *.log *.aux *.toc *.lof *.blg *.bbl *.out
rm -f UserGuide.pdf
.PHONY: clean
Makefile: Makefile.in ../../config.status
cd ../.. && ./config.status
......@@ -97,3 +97,9 @@ clean:
location.hh \
stack.hh \
position.hh
# Recreate Makefile when necessary
Makefile: Makefile.in ../config.status
cd .. && ./config.status
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment