Big rename fest in makefile.shared: link_a / link_o -> link_shlib / link_dso

[openssl.git] / engines / Makefile.in

diff --git a/engines/Makefile.in b/engines/Makefile.in
index aed9ff512e310964bd8560b3e0e17762cda57271..e54d60e3ec42b49b0131a0bfe276fd17db0da80d 100644 (file)
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -13,9 +13,9 @@ CFLAG=-g
 MAKEFILE=      Makefile
 AR=            ar r
 
-ENGINES_ASM_OBJ=
+PADLOCK_ASM_OBJ=
 
-PEX_LIBS=
+PLIB_LDFLAG=
 EX_LIBS=
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -34,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
@@ -62,8 +62,8 @@ lib:  $(LIBOBJ) $(TESTLIBOBJ)
                for l in $(LIBNAMES) $(TESTLIBNAMES); do \
                        $(MAKE) -f ../Makefile.shared -e \
                                LIBNAME=$$l LIBEXTRAS="e_$$l*.o" \
-                               LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \
-                               link_o.$(SHLIB_TARGET); \
+                               LIBDEPS='$(PLIB_LDFLAG) -L.. -lcrypto $(EX_LIBS)' \
+                               link_dso.$(SHLIB_TARGET); \
                done; \
        else \
                $(AR) $(LIB) $(LIBOBJ); \
@@ -88,13 +88,13 @@ install:
        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
        @if [ -n "$(SHARED_LIBS)" ]; then \
                set -e; \
-               $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
+               $(PERL) $(TOP)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines; \
                for l in $(LIBNAMES); do \
                        ( echo installing $$l; \
                          pfx=lib; \
                          if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
                                sfx=".so"; \
-                               cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+                               cp cyg$$l.dll $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
                          else \
                                case "$(CFLAGS)" in \
                                *DSO_DLFCN*)    sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;;    \
@@ -102,10 +102,10 @@ install:
                                *DSO_WIN32*)    sfx="eay32.dll"; pfx=;; \
                                *)              sfx=".bad";;    \
                                esac; \
-                               cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+                               cp $$pfx$$l$$sfx $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
                          fi; \
-                         chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+                         chmod 555 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+                         mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
                done; \
        fi
 
@@ -115,14 +115,9 @@ errors:
                        -nostatic -staticloader -write e_$$l.c; \
        done
 
-update: local_depend
-       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-
-depend: local_depend
-       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-
-local_depend:
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) $(TESTLIBSRC)
+depend:
+       @[ -z "$(THIS)" ] || $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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