Refactoring BIO: add a simple networking test of s_client and s_server

[openssl.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index c48bc66de02c5a1a040d0066b1b568f15c4c3646..cf6e8163a009985cf6f23d89cbdb2979e33ed212 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -10,7 +10,7 @@ CFLAG=                -g
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 PERL=          perl
 
-PEX_LIBS=
+LDFLAGS=
 EX_LIBS= #-lnsl -lsocket
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -162,13 +162,8 @@ list-tests:
 apps:
        @(cd ..; $(MAKE) DIRS=apps all)
 
-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) $(SRC)
+depend:
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
 
 clean:
        rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log *.log dummytest
@@ -185,14 +180,14 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
        LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o $$testutil" \
-               LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+               LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
 BUILD_CMD_STATIC=shlib_target=; \
        LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO)"; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o $$testutil" \
-               LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+               LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -247,7 +242,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
        fi; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-               LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+               LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
 FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -260,7 +255,7 @@ FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
        [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-               LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+               LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
 $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
@@ -373,9 +368,9 @@ $(ASYNCTEST)$(EXE_EXT): $(ASYNCTEST).o
 
 #$(AESTEST)$(EXE_EXT): $(AESTEST).o $(DLIBCRYPTO)
 #      if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \
-#        $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \
+#        $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(LDFLAGS) $(DLIBCRYPTO) $(EX_LIBS) ; \
 #      else \
-#        $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \
+#        $(CC) -o $(AESTEST)$(EXE_EXT) $(CFLAGS) $(AESTEST).o $(LDFLAGS) $(LIBCRYPTO) $(EX_LIBS) ; \
 #      fi
 
 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)