From fda2564c83a46585dc668a7e99d7ad1293029233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Sun, 20 Apr 1997 13:36:18 -0700 Subject: [PATCH] make for _Crypto/lib changed Rev: src/modules/_Crypto/Makefile.in:1.12 Rev: src/modules/_Crypto/lib/Makefile.in:1.7 Rev: src/modules/dynamic_module_makefile.in:1.11 Rev: src/modules/static_module_makefile.in:1.10 --- src/modules/_Crypto/Makefile.in | 10 +--------- src/modules/_Crypto/lib/Makefile.in | 4 ++-- src/modules/dynamic_module_makefile.in | 9 ++++++--- src/modules/static_module_makefile.in | 9 ++++++--- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/modules/_Crypto/Makefile.in b/src/modules/_Crypto/Makefile.in index cd9f478f6f..37e0c59273 100644 --- a/src/modules/_Crypto/Makefile.in +++ b/src/modules/_Crypto/Makefile.in @@ -7,16 +7,8 @@ MODULE_SUBDIRS=lib @SET_MAKE@ MODULE_CPPFLAGS= -I$(SRCDIR)/include -DPIKE +MODULE_MAKE_FLAGS="EXTRA_CPP_FLAGS=-DPIKE -I$(SRCDIR)/../.. -I../../.." @dynamic_module_makefile@ -# Create library of algorithms -lib/algorithms.a: FORCE - cd lib; $(MAKE) \ - "CC=$(CC)" \ - "EXTRA_CPP_FLAGS=-DPIKE -g -I$(SRCDIR)/../.. -I../../.." \ - "EXTRA_CFLAGS= $(CFLAGS)" algorithms.a - -FORCE: - @dependencies@ diff --git a/src/modules/_Crypto/lib/Makefile.in b/src/modules/_Crypto/lib/Makefile.in index a1db220ca7..86e2c01c65 100644 --- a/src/modules/_Crypto/lib/Makefile.in +++ b/src/modules/_Crypto/lib/Makefile.in @@ -11,10 +11,10 @@ VPATH=$(SRCDIR):$(SRCDIR)/../include CRYPTO_INCLUDES=$(SRCDIR)/../include # Additional C preprocessor flags -PREFLAGS= $(EXTRA_CPP_FLAGS) -I$(CRYPTO_INCLUDES) -I. -I$(SRCDIR) +PREFLAGS=$(DEFINES) $(EXTRA_CPP_FLAGS) -I$(CRYPTO_INCLUDES) -I. -I$(SRCDIR) # The flags to generate a shared library -CFLAGS= $(EXTRA_CFLAGS) $(PREFLAGS) +CFLAGS=$(PREFLAGS) $(OTHER_FLAGS) $(EXTRA_CFLAGS) default: algorithms.a diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in index 308d1fe61b..a8f6cb7b99 100644 --- a/src/modules/dynamic_module_makefile.in +++ b/src/modules/dynamic_module_makefile.in @@ -1,9 +1,12 @@ PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. -I. $(MODULE_CPPFLAGS) CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @CCSHARED@ $(MODULE_CFLAGS) -MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" +MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" $(MODULE_MAKE_FLAGS) -all: module.@SO@ dummy +all: subdirs module.@SO@ dummy + +subdirs: + for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done 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 @@ -42,7 +45,7 @@ verbose_verify: module_testsuite gdb_verify: module_testsuite @echo >.gdbinit handle SIGUSR1 nostop noprint pass - @echo >>.gdbinit run -DNOT_INSTALLED -M.. -m $(SRCDIR)/../../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f + @echo >>.gdbinit run -DNOT_INSTALLED -m ../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f gdb ../../pike @rm .gdbinit diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in index cea6f89e79..27f65f4bf2 100644 --- a/src/modules/static_module_makefile.in +++ b/src/modules/static_module_makefile.in @@ -1,9 +1,12 @@ PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. -I. -Dpike_module_init=pike_module_$(MODNAME)_init -Dpike_module_exit=pike_module_$(MODNAME)_exit $(MODULE_CPPFLAGS) CFLAGS=$(PREFLAGS) $(OTHERFLAGS) $(MODULE_CFLAGS) -MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" +MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" $(MODULE_MAKE_FLAGS) -all: module.a dummy +all: subdirs module.a dummy + +subdirs: + for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done 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 @@ -46,7 +49,7 @@ verbose_verify: module_testsuite gdb_verify: module_testsuite @echo >.gdbinit handle SIGUSR1 nostop noprint pass - @echo >>.gdbinit run -DNOT_INSTALLED -M.. -m $(SRCDIR)/../../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f + @echo >>.gdbinit run -DNOT_INSTALLED -m ../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f gdb ../../pike @rm .gdbinit -- GitLab