From a5821552f83dede8c3f69f44b58501d975bcd190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Wed, 12 Mar 1997 01:20:50 +0100 Subject: [PATCH] Now remakes a bit less. Rev: src/modules/dynamic_module_makefile.in:1.6 Rev: src/modules/static_module_makefile.in:1.4 --- src/modules/dynamic_module_makefile.in | 10 ++++++++-- src/modules/static_module_makefile.in | 12 ++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in index a5a29390d1..c6ceae1564 100644 --- a/src/modules/dynamic_module_makefile.in +++ b/src/modules/dynamic_module_makefile.in @@ -5,11 +5,17 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL all: module.@SO@ dummy -dummy: $(DUMMY) +dummy: $(DUMMY) linker_options modlist_headers modlist_segment + tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so + +linker_options: Makefile echo "$(LINKER_OPTIONS)" >linker_options + +modlist_headers: Makefile echo "" >modlist_headers + +modlist_segment: Makefile echo "" >modlist_segment - tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so module.so: $(OBJS) $(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_LDFLAGS) diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in index a18980f8c3..d298cb0979 100644 --- a/src/modules/static_module_makefile.in +++ b/src/modules/static_module_makefile.in @@ -5,12 +5,20 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL all: module.a dummy -dummy: +dummy: linker_options modlist_headers modlist_segment module.pmod + tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod + +linker_options: Makefile echo >linker_options modules/$(MODNAME)/module.a $(MODULE_LDFLAGS) + +modlist_headers: Makefile echo >modlist_headers "void pike_module_$(MODNAME)_init(void), pike_module_$(MODNAME)_exit(void);" + +modlist_segment: Makefile echo >modlist_segment " ,{ \"$(MODNAME)\", pike_module_$(MODNAME)_init, pike_module_$(MODNAME)_exit } " + +module.pmod: Makefile echo >module.pmod "inherit _static_modules.$(MODNAME);" - tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod module.a: $(OBJS) -rm -f module.a -- GitLab