Skip to content
Snippets Groups Projects
Commit 46ea9915 authored by Marcus Comstedt's avatar Marcus Comstedt
Browse files

Added some workarounds for broken shells.

Rev: src/modules/dynamic_module_makefile.in:1.26
Rev: src/modules/static_module_makefile.in:1.21
parent b0109656
No related branches found
No related tags found
No related merge requests found
# #
# $Id: dynamic_module_makefile.in,v 1.25 1997/11/04 23:05:35 grubba Exp $ # $Id: dynamic_module_makefile.in,v 1.26 1997/11/29 02:57:46 marcus Exp $
# #
...@@ -15,13 +15,13 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL ...@@ -15,13 +15,13 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL
all: subdirs dummy all: subdirs dummy
subdirs: subdirs:
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; fi ; done for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; else :; fi ; done
dummy: $(DUMMY) linker_options modlist_headers modlist_segment module.so dummy: $(DUMMY) linker_options modlist_headers modlist_segment module.so
tmp="$(INSTALL_NAME)" ; \ tmp="$(INSTALL_NAME)" ; \
if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ;\ if test x$$tmp = x ; then tmp="$(MODNAME)"; else :; fi ;\
$(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so ;\ $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so ;\
if [ -f $(SRCDIR)/module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <$(SRCDIR)/module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod ; fi if [ -f $(SRCDIR)/module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <$(SRCDIR)/module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod ; else :; fi
linker_options: Makefile linker_options: Makefile
echo "$(LINKER_OPTIONS)" >linker_options echo "$(LINKER_OPTIONS)" >linker_options
...@@ -39,16 +39,16 @@ Makefile: ../dynamic_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencie ...@@ -39,16 +39,16 @@ Makefile: ../dynamic_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencie
module.so: $(OBJS) $(MODULE_ARCHIVES) module.so: $(OBJS) $(MODULE_ARCHIVES)
$(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) -lc $(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) -lc
if test @SO@ != so ; then mv module.@SO@ module.so ; fi if test @SO@ != so ; then mv module.@SO@ module.so ; else :; fi
clean: clean:
-rm -f *.o *.a *.so module.so -rm -f *.o *.a *.so module.so
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo cleaning $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) clean ) ; fi ; done for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo cleaning $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) clean ) ; else :; fi ; done
depend: depend:
gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR) gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making depend in $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) depend ) ; fi ; done for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making depend in $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) depend ) ; else :; fi ; done
#verify / debug #verify / debug
module_testsuite: $(SRCDIR)/testsuite.in module_testsuite: $(SRCDIR)/testsuite.in
......
# #
# $Id: static_module_makefile.in,v 1.20 1997/11/04 23:05:49 grubba Exp $ # $Id: static_module_makefile.in,v 1.21 1997/11/29 02:57:47 marcus Exp $
# #
...@@ -15,16 +15,16 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL ...@@ -15,16 +15,16 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL
all: subdirs dummy all: subdirs dummy
subdirs: subdirs:
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; fi ; done for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; else :; fi ; done
dummy: linker_options modlist_headers modlist_segment module.pmod module.a dummy: linker_options modlist_headers modlist_segment module.pmod module.a
tmp="$(INSTALL_NAME)" ;\ tmp="$(INSTALL_NAME)" ;\
if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ;\ if test x$$tmp = x ; then tmp="$(MODNAME)"; else :; fi ;\
$(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod
linker_options: Makefile $(MODULE_ARCHIVES) linker_options: Makefile $(MODULE_ARCHIVES)
echo >linker_options modules/$(MODNAME)/module.a $(MODULE_LDFLAGS) echo >linker_options modules/$(MODNAME)/module.a $(MODULE_LDFLAGS)
for a in '' $(MODULE_ARCHIVES) ; do if test ! -z "$$a"; then echo modules/$(MODNAME)/$$a >>linker_options ; fi ; done for a in '' $(MODULE_ARCHIVES) ; do if test ! -z "$$a"; then echo modules/$(MODNAME)/$$a >>linker_options ; else :; fi ; done
modlist_headers: Makefile modlist_headers: Makefile
echo >modlist_headers "void pike_module_$(MODNAME)_init(void), pike_module_$(MODNAME)_exit(void);" echo >modlist_headers "void pike_module_$(MODNAME)_init(void), pike_module_$(MODNAME)_exit(void);"
...@@ -48,15 +48,15 @@ module.a: $(OBJS) ...@@ -48,15 +48,15 @@ module.a: $(OBJS)
-rm -f module.a -rm -f module.a
$(AR) cq module.a $(OBJS) $(AR) cq module.a $(OBJS)
-@RANLIB@ module.a -@RANLIB@ module.a
if test -f linker_options ; then touch linker_options ; fi if test -f linker_options ; then touch linker_options ; else :; fi
clean: clean:
-rm -f *.o *.a *.so module.so module.pmod -rm -f *.o *.a *.so module.so module.pmod
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo cleaning $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) clean ) ; fi ; done for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo cleaning $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) clean ) ; else :; fi ; done
depend: depend:
gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR) gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making depend in $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) depend ) ; fi ; done for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making depend in $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) depend ) ; else :; fi ; done
#verify / debug #verify / debug
module_testsuite: $(SRCDIR)/testsuite.in module_testsuite: $(SRCDIR)/testsuite.in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment