Branch: Tag:

2006-06-17

2006-06-17 19:31:17 by Martin Stjernholm <mast@lysator.liu.se>

Added a system to propagate make variables in a clean and centralized way.
Still only used for some obvious variables - no cruft is cleaned up yet.

Rev: src/aclocal.m4:1.119
Rev: src/make_variables.in:1.18
Rev: src/modules/Makefile.in:1.52
Rev: src/modules/common_module_makefile.in:1.34
Rev: src/modules/configure.in:1.9
Rev: src/post_modules/Makefile.in:1.17
Rev: src/post_modules/configure.in:1.5

1:   # -*- Makefile -*-   # - # $Id: make_variables.in,v 1.17 2006/02/27 12:33:55 mast Exp $ + # $Id: make_variables.in,v 1.18 2006/06/17 19:31:17 mast Exp $   #   # Note: This template is actually used only for make_variables in the   # subdirectories; the one created in the build base dir is just an   # unwanted by-product.    -  + # There's magic to propagate variables to subdir configure scripts and + # to retain those variables when a subdir is reconfigured + # individually: + # + # Lines beginning with "#propagated_variables:" list such variables. + # They are available both as make variables and in the configure + # script environment. The PIKE_RETAIN_VARIABLES macro (called through + # AC_MODULE_INIT) reads them from the propagated_variables file if it + # exists, and assigns them in the environment only if they don't have + # any value already. + # + # Note: The easiest way to force full repropagation is to rerun the + # core configure script (e.g. through "make force_configure" in the + # top directory). + @propagated_variables@ + #propagated_variables: CC CPP LDSHARED AR INSTALL + #propagated_variables: OPTIMIZE WARN + #propagated_variables: PIKE_SRC_DIR BUILD_BASE +    @SET_MAKE@   prefix=@prefix@   exec_prefix=$(prefix)/bin - CC=@CC@ - CPP=@CPP@ - LDSHARED=@LDSHARED@ +    TMP_BUILDDIR=@BUILDDIR@   TMP_BINDIR=@BINDIR@   DEFINES=@CPPFLAGS@ @DEFS@   TMP_LIBDIR=$(TMP_BUILDDIR)/lib - PIKE_SRC_DIR=@PIKE_SRC_DIR@ - BUILD_BASE=@BUILD_BASE@ +       DEFAULT_RUNPIKE=$(TMP_BUILDDIR)/tpike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)   USE_PIKE=pike $(PIKEOPTS)   RUNPIKE=$(@RUNPIKE@)    - OPTIMIZE=@OPTIMIZE@ - INSTALL=@INSTALL@ - WARN=@WARN@ +    OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL)   NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL) - AR=@AR@ +    SRCDIR=@srcdir@   PMOD_TARGETS=@PMOD_TARGETS@   make_variables_in=@make_variables_in@
38:   MODNAME=@MODULE_NAME@   MODPATH=@MODULE_PATH@   MODDIR=@MODULE_DIR@ +  + # End of make_variables.in