Skip to content
Browse files

Incorporate VPATH magic

  • Loading branch information...
1 parent 6d04572 commit 9f90dc59b70da1e1d726bbea3b17f880d69a4ccd Toby White committed Jul 22, 2008
Showing with 1,575 additions and 1,863 deletions.
  1. +22 −22 Makefile
  2. +1 −0 arch.make.in
  3. +2 −1 config/configure.ac
  4. +1,550 −1,840 configure
View
44 Makefile
@@ -15,61 +15,61 @@ install: objsdir $(BUILD_TARGETS)
$(INSTALL) FoX-config $(install_prefix)/bin
#
examples_build:
- if test -d examples; then (cd examples; $(MAKE)) fi
+ if test -d examples; then (cd examples; $(MAKE) VPATH=$(VPATH)/examples) fi
#
#---------------------------
#
# Recursive make for each module
#
dom_lib: objsdir sax_lib wxml_lib
- (cd dom; $(MAKE))
+ (cd dom; $(MAKE) VPATH=$(VPATH)/dom)
dom_lib_clean:
- if test -d dom; then (cd dom; $(MAKE) clean) fi
+ if test -d dom; then (cd dom; $(MAKE) VPATH=$(VPATH)/dom clean) fi
dom_lib_check: sax_lib_check wxml_lib_check
- (cd dom; $(MAKE) check)
+ (cd dom; $(MAKE) VPATH=$(VPATH)/dom check)
touch dom_lib_check
#
sax_lib: objsdir common_lib utils_lib fsys_lib
- (cd sax; $(MAKE))
+ (cd sax; $(MAKE) VPATH=$(VPATH)/sax)
sax_lib_clean:
- if test -d sax; then (cd sax; $(MAKE) clean) fi
+ if test -d sax; then (cd sax; $(MAKE) VPATH=$(VPATH)/sax clean) fi
sax_lib_check: common_lib_check
- (cd sax; $(MAKE) check)
+ (cd sax; $(MAKE) VPATH=$(VPATH)/sax check)
touch sax_lib_check
#
wxml_lib: objsdir common_lib fsys_lib
- (cd wxml; $(MAKE))
+ (cd wxml; $(MAKE) VPATH=$(VPATH)/wxml)
wxml_lib_clean:
- if test -d wxml; then (cd wxml; $(MAKE) clean) fi
+ if test -d wxml; then (cd wxml; $(MAKE) VPATH=$(VPATH)/wxml clean) fi
wxml_lib_check: common_lib_check
- (cd wxml; $(MAKE) check)
+ (cd wxml; $(MAKE) VPATH=$(VPATH)/wxml check)
touch wxml_lib_check
#
wcml_lib: objsdir utils_lib wxml_lib
- (cd wcml; $(MAKE))
+ (cd wcml; $(MAKE) VPATH=$(VPATH)/wcml)
wcml_lib_clean:
- if test -d wcml; then (cd wcml; $(MAKE) clean) fi
+ if test -d wcml; then (cd wcml; $(MAKE) VPATH=$(VPATH)/wcml clean) fi
wcml_lib_check: wxml_lib_check
- (cd wcml; $(MAKE) check)
+ (cd wcml; $(MAKE) VPATH=$(VPATH)/wcml check)
touch wcml_lib_check
#
common_lib: objsdir fsys_lib utils_lib
- (cd common; $(MAKE))
+ (cd common; $(MAKE) VPATH=$(VPATH)/common)
common_lib_clean:
- if test -d common; then (cd common; $(MAKE) clean) fi
+ if test -d common; then (cd common; $(MAKE) VPATH=$(VPATH)/common clean) fi
common_lib_check:
- (cd common; $(MAKE) check)
+ (cd common; $(MAKE) VPATH=$(VPATH)/common check)
touch common_lib_check
#
utils_lib: objsdir fsys_lib
- (cd utils; $(MAKE))
+ (cd utils; $(MAKE) VPATH=$(VPATH)/utils)
utils_lib_clean:
- if test -d utils; then (cd utils; $(MAKE) clean) fi
+ if test -d utils; then (cd utils; $(MAKE) VPATH=$(VPATH)/utils clean) fi
#
fsys_lib: objsdir
- (cd fsys; $(MAKE))
+ (cd fsys; $(MAKE) VPATH=$(VPATH)/fsys)
fsys_lib_clean:
- if test -d fsys; then (cd fsys; $(MAKE) clean) fi
+ if test -d fsys; then (cd fsys; $(MAKE) VPATH=$(VPATH)/fsys clean) fi
#
check: default
@if ! test -d examples; then echo "You need to download the full version of FoX to run the testsuite"; \
@@ -82,7 +82,7 @@ check: default
fi
#
DoX:
- (cd DoX; $(MAKE))
+ (cd DoX; $(MAKE) VPATH=$(VPATH)/DoX)
#
cutdown:
rm -rf .gitignore DoX/ config/aclocal.m4 config/autom4te.cache config/configure.ac config/m4/ config/makefile examples/ m4/ */test/ */*.m4 Changelog RELEASE release.sh
@@ -101,7 +101,7 @@ cutdown-dom: cutdown
rm -rf wcml/
clean: wxml_lib_clean wcml_lib_clean common_lib_clean fsys_lib_clean sax_lib_clean dom_lib_clean utils_lib_clean
- if test -d examples; then (cd examples; $(MAKE) clean) fi
+ if test -d examples; then (cd examples; $(MAKE) VPATH=$(VPATH)/examples clean) fi
rm -rf objs .FoX check.out *_check
#
distclean: clean
View
1 arch.make.in
@@ -3,6 +3,7 @@
BUILD_TARGETS=@BUILD_TARGETS@
+VPATH=@VPATH@
compile_prefix=@OBJSDIR@
install_prefix=@prefix@
LIB_DIR=$(compile_prefix)/lib
View
3 config/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([FoX],[4.0.1],[tow@uszla.me.uk])
+AC_INIT([FoX],[4.0.2],[tow@uszla.me.uk])
AC_CONFIG_SRCDIR([README.FoX.txt])
dnl
dnl Find system type.
@@ -187,6 +187,7 @@ dnl Installation instructions ..
AC_PROG_INSTALL
AC_PROG_MKDIR_P
TW_PROG_CYGPATH_W
+AC_SUBST(VPATH)
OBJSDIR=`pwd`/objs
AC_SUBST(OBJSDIR)
AC_FC_MOD_PATH_FLAG
View
3,390 configure
1,550 additions, 1,840 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit 9f90dc5

Please sign in to comment.
Something went wrong with that request. Please try again.