From b4ddecea0daeb58b0c0b9e9be9d0c093c3c965ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Fri, 5 Mar 1999 22:00:26 -0800 Subject: [PATCH] some fixes for when configure is re-run... Rev: src/Makefile.in:1.129 Rev: src/modules/Makefile.in:1.26 Rev: src/modules/dynamic_module_makefile.in:1.47 Rev: src/modules/static_module_makefile.in:1.42 --- src/Makefile.in | 4 ++-- src/modules/Makefile.in | 4 ++-- src/modules/dynamic_module_makefile.in | 9 ++++++--- src/modules/static_module_makefile.in | 8 ++++++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 1fd5fa5344..bf07f1e7a1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.128 1999/02/05 05:08:18 mast Exp $ +# $Id: Makefile.in,v 1.129 1999/03/06 06:00:21 hubbe Exp $ # # This line is needed on some machines. @@ -78,7 +78,7 @@ LDFLAGS=@LDFLAGS@ @LINKFORSHARED@ $(EXTRALDFLAGS) RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) MOST_MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" "NOOPTFLAGS=$(NOOPTFLAGS)" "AR=$(AR)" -MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)" +MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)" # Add alloca.o if you don't have alloca() on your machine. # diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index c4a3948383..6d30d9249e 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.25 1999/03/01 05:32:44 hubbe Exp $ +# $Id: Makefile.in,v 1.26 1999/03/06 06:00:23 hubbe Exp $ @SET_MAKE@ @@ -11,7 +11,7 @@ MODULES=@subdirs@ MODULE_SEGMENTS=@MODULE_SEGMENTS@ MODULE_LINKOPTS=@MODULE_LINKOPTS@ -MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "DEFINES=$(DEFINES)" "INSTALL=$(INSTALL)" "AR=$(AR)" +MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "DEFINES=$(DEFINES)" "INSTALL=$(INSTALL)" "AR=$(AR)" LDFLAGS="$(LDFLAGS)" all: linker_options modlist.h modlist_headers.h diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in index a2ac7a3d2a..bc6b6206b5 100644 --- a/src/modules/dynamic_module_makefile.in +++ b/src/modules/dynamic_module_makefile.in @@ -1,5 +1,5 @@ # -# $Id: dynamic_module_makefile.in,v 1.46 1999/03/03 02:39:26 hubbe Exp $ +# $Id: dynamic_module_makefile.in,v 1.47 1999/03/06 06:00:24 hubbe Exp $ # @@ -7,6 +7,9 @@ CC=@CC@ CPP=@CPP@ AR=@AR@ LIBGCC=@LIBGCC@ +REAL_LDFLAGS="@LDFLAGS@" +REAL_CFLAGS="@CFLAGS@" +REAL_CPPFLAGS="@CPPFLAGS@" PIKE_SRC_DIR=$(SRCDIR)/../.. BUILD_BASE=../.. @@ -39,7 +42,7 @@ modlist_segment: Makefile echo "" >modlist_segment Makefile: $(MODULE_BASE)/dynamic_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies config.status - CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status + CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status touch remake @echo "Run make again" @exit 1 @@ -54,7 +57,7 @@ config.status: $(SRCDIR)/configure ./config.status --recheck module.so: $(OBJS) $(MODULE_ARCHIVES) - $(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) $(LIBGCC) -lc $(LIBGCC) + $(TMP_BINDIR)/smartlink "@LDSHARED@" $(LDFLAGS) -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) $(LIBGCC) -lc $(LIBGCC) if test @SO@ != so ; then mv module.@SO@ module.so ; else :; fi clean: diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in index c48189e4f6..b3e8cc316f 100644 --- a/src/modules/static_module_makefile.in +++ b/src/modules/static_module_makefile.in @@ -1,5 +1,5 @@ # -# $Id: static_module_makefile.in,v 1.41 1999/03/03 02:39:27 hubbe Exp $ +# $Id: static_module_makefile.in,v 1.42 1999/03/06 06:00:26 hubbe Exp $ # @@ -10,6 +10,10 @@ PIKE_SRC_DIR=$(SRCDIR)/../.. BUILD_BASE=../.. MODULE_BASE=.. +REAL_LDFLAGS="@LDFLAGS@" +REAL_CFLAGS="@CFLAGS@" +REAL_CPPFLAGS="@CPPFLAGS@" + PREFLAGS=-I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. -I. -Dpike_module_init=pike_module_$(MODNAME)_init -Dpike_module_exit=pike_module_$(MODNAME)_exit $(MODULE_CPPFLAGS) $(DEFINES) CFLAGS=$(PREFLAGS) $(OTHERFLAGS) $(MODULE_CFLAGS) @@ -47,7 +51,7 @@ modlist_segment: Makefile echo >modlist_segment " ,{ \"$(MODNAME)\", pike_module_$(MODNAME)_init, pike_module_$(MODNAME)_exit } " Makefile: ../static_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies config.status - CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status + CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" CPPFLAGS="$(REAL_CPPFLAGS)" CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status touch remake @echo "Run make again" @exit 1 -- GitLab