X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=engines%2FMakefile.in;h=b2580199b933841213c26008c933d5eb679b5ba4;hp=b8665ff406785771d5b86284bebdf46d6ab4fcbd;hb=05e4e63366593298a362393c8152863771d92130;hpb=ee6d9f4eb602479d04872f3a9fd1d3904bd96fd1 diff --git a/engines/Makefile.in b/engines/Makefile.in index b8665ff406..b2580199b9 100644 --- a/engines/Makefile.in +++ b/engines/Makefile.in @@ -12,14 +12,8 @@ INCLUDES= -I../include CFLAG=-g MAKEFILE= Makefile AR= ar r -ENGDIRS= ccgost -RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ - (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ - $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ - done; - -ENGINES_ASM_OBJ= +PADLOCK_ASM_OBJ= PEX_LIBS= EX_LIBS= @@ -40,7 +34,7 @@ LIBOBJ= \ e_padlock.o \ e_capi.o \ e_dasync.o \ - $(ENGINES_ASM_OBJ) + $(PADLOCK_ASM_OBJ) TESTLIBNAMES= ossltest TESTLIBSRC= e_ossltest.c @@ -60,7 +54,7 @@ ALL= $(GENERAL) $(SRC) $(HEADER) top: (cd ..; $(MAKE) DIRS=$(DIR) all) -all: lib subdirs +all: lib lib: $(LIBOBJ) $(TESTLIBOBJ) @if [ -n "$(SHARED_LIBS)" ]; then \ @@ -82,12 +76,8 @@ e_padlock-x86.s: asm/e_padlock-x86.pl e_padlock-x86_64.s: asm/e_padlock-x86_64.pl $(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@ -subdirs: - @target=all; $(RECURSIVE_MAKE) - files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - @target=files; $(RECURSIVE_MAKE) # XXXXX This currently only works on systems that use .so as suffix # for shared libraries as well as for Cygwin which uses the @@ -118,27 +108,18 @@ install: mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ done; \ fi - @target=install; $(RECURSIVE_MAKE) errors: set -e; for l in $(LIBNAMES); do \ $(PERL) ../util/mkerr.pl -conf e_$$l.ec \ -nostatic -staticloader -write e_$$l.c; \ done - (cd ccgost; $(MAKE) PERL=$(PERL) errors) - -update: local_depend - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi - @[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) ) -depend: local_depend - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi - @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) -local_depend: +depend: @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) $(TESTLIBSRC) + @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) clean: rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - @target=clean; $(RECURSIVE_MAKE) # DO NOT DELETE THIS LINE -- make depend depends on it.