From: stephan b. <sg...@us...> - 2004-12-24 23:06:39
|
Update of /cvsroot/pclasses/pclasses2/toc/make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8043/toc/make Modified Files: BIN_PROGRAMS.make toc.make.at Log Message: Mass commit: build fixes. Can now build tests using proper configure steps, at least on linux systems. Index: toc.make.at =================================================================== RCS file: /cvsroot/pclasses/pclasses2/toc/make/toc.make.at,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- toc.make.at 22 Dec 2004 19:04:24 -0000 1.1 +++ toc.make.at 24 Dec 2004 23:06:28 -0000 1.2 @@ -20,6 +20,12 @@ all: FORCE: ; @true +ifneq (,$(wildcard Makefile.toc)) + TOC_MAKEFILE_NAME = Makefile.toc +else + TOC_MAKEFILE_NAME = Makefile +endif + # try to save some grief later: .toc.%: $(wildcard *) Index: BIN_PROGRAMS.make =================================================================== RCS file: /cvsroot/pclasses/pclasses2/toc/make/BIN_PROGRAMS.make,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- BIN_PROGRAMS.make 22 Dec 2004 19:04:24 -0000 1.1 +++ BIN_PROGRAMS.make 24 Dec 2004 23:06:28 -0000 1.2 @@ -43,8 +43,8 @@ BIN_PROGRAMS_RULES_GENERATOR = $(TOC_MAKESDIR)/makerules.BIN_PROGRAMS -BIN_PROGRAMS_COMMON_DEPS += Makefile $(BIN_PROGRAMS_MAKEFILE) $(BIN_PROGRAMS_OBJECTS) -$(BIN_PROGRAMS_DEPSFILE): Makefile $(BIN_PROGRAMS_RULES_GENERATOR) $(BIN_PROGRAMS_MAKEFILE) +BIN_PROGRAMS_COMMON_DEPS += $(TOC_MAKEFILE_NAME) $(BIN_PROGRAMS_MAKEFILE) $(BIN_PROGRAMS_OBJECTS) +$(BIN_PROGRAMS_DEPSFILE): $(TOC_MAKEFILE_NAME) $(BIN_PROGRAMS_RULES_GENERATOR) $(BIN_PROGRAMS_MAKEFILE) ifeq (1,$(MAKING_CLEAN)) @echo "$(MAKECMDGOALS): skipping BIN_PROGRAMS rules generation." else |