Commit 6ab36414 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove some old files.



I read the PROBLEMS, and they're outdated; nothing I'd put in the
online FAQ, for example.  Test-builds work without using these files.
Had to remove the rehash.time stuff from Makefile.in

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent b23238f9
Loading
Loading
Loading
Loading
+1 −11
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ build_tests_nodep : $(TESTPROGS)

test tests : configdata.pm, -
             build_apps_nodep, build_engines_nodep, build_tests_nodep, -
             depend, rehash
             depend
        SET DEFAULT [.test]{- move("test") -}
        DEFINE SRCTOP {- sourcedir() -}
        DEFINE BLDTOP {- builddir() -}
@@ -384,16 +384,6 @@ check_INSTALLTOP :

# Helper targets #####################################################

rehash : copy-certs, build_apps_nodep
        !MCR [.apps]openssl.exe rehash {- builddir("certs", "demo") -}
        $(PERL) [.tools]c_rehash. [.certs.demo]

copy-certs :
        @ IF F$SEARCH("{- buildfile("certs.dir") -}") .EQS. "" THEN -
             CREATE/DIR {- builddir("certs") -}
        -@ IF "{- sourcedir("certs") -}" .NES. "{- builddir("certs") -}" THEN -
             COPY {- tree(sourcedir("certs")) -}*.* {- tree(builddir("certs")) -}

# Developer targets ##################################################

debug_logicals :
+2 −18
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
build_tests: configdata.pm build_tests_nodep depend
build_tests_nodep: $(TESTPROGS)

test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend rehash
test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
	( cd test; \
	  SRCTOP=../$(SRCDIR) \
	  BLDTOP=../$(BLDDIR) \
@@ -242,7 +242,7 @@ clean: libclean
	rm -f $(PROGRAMS) $(TESTPROGS)
	rm -f `find $(BLDDIR) -name '*{- $depext -}'`
	rm -f `find $(BLDDIR) -name '*{- $objext -}'`
	rm -f $(BLDDIR)/core $(BLDDIR)/rehash.time
	rm -f $(BLDDIR)/core
	rm -f $(BLDDIR)/tags $(BLDDIR)/TAGS
	rm -f $(BLDDIR)/openssl.pc $(BLDDIR)/libcrypto.pc $(BLDDIR)/libssl.pc
	-rm -f `find $(BLDDIR) -type l`
@@ -693,17 +693,6 @@ dist:

# Helper targets #####################################################

rehash: link-utils copy-certs build_apps_nodep
	@if [ -z "$(CROSS_COMPILE)" ]; then \
		(OPENSSL="$(BLDDIR)/util/shlib_wrap.sh apps/openssl"; \
		[ -x "$(BLDDIR)/openssl.exe" ] && OPENSSL="$(BLDDIR)/openssl.exe" || :; \
		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
		$$OPENSSL rehash certs/demo \
		|| $(PERL) tools/c_rehash certs/demo) && \
		touch rehash.time; \
	else :; fi

link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh

$(BLDDIR)/util/opensslwrap.sh: configdata.pm
@@ -717,11 +706,6 @@ $(BLDDIR)/util/shlib_wrap.sh: configdata.pm
	    ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \
	fi

copy-certs: FORCE
	@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
	    cp -R "$(SRCDIR)/certs" "$(BLDDIR)/"; \
	fi

$(SRCDIR)/apps/openssl-vms.cnf: $(SRCDIR)/apps/openssl.cnf
	$(PERL) $(SRCDIR)/VMS/VMSify-conf.pl \
                < $(SRCDIR)/apps/openssl.cnf > $(SRCDIR)/apps/openssl-vms.cnf

GitConfigure

deleted100755 → 0
+0 −10
Original line number Diff line number Diff line
#!/bin/sh

BRANCH=`git rev-parse --abbrev-ref HEAD`

./Configure $@
make files
util/mk1mf.pl OUT=out.$BRANCH TMP=tmp.$BRANCH INC=inc.$BRANCH copy > makefile.$BRANCH
MAKE=make
which bsdmake > /dev/null && MAKE=bsdmake
$MAKE -f makefile.$BRANCH init

GitMake

deleted100755 → 0
+0 −7
Original line number Diff line number Diff line
#!/bin/sh

BRANCH=`git rev-parse --abbrev-ref HEAD`

MAKE=make
which bsdmake > /dev/null && MAKE=bsdmake
$MAKE -f makefile.$BRANCH $@
+2 −15
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ libclean:
	rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib

clean:	libclean
	rm -f */*/*.o */*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
	rm -f */*/*.o */*.o *.o core a.out fluff testlog make.log cctest cctest.c
	rm -rf *.bak certs/.0
	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
	rm -f $(LIBS) tags TAGS
@@ -471,22 +471,9 @@ gentests:
	@(cd test && echo "generating dummy tests (if needed)..." && \
	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );

rehash: rehash.time
rehash.time: certs build_apps build_tools
	@if [ -z "$(CROSS_COMPILE)" ]; then \
		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
		$$OPENSSL rehash certs/demo \
		|| $(PERL) tools/c_rehash certs/demo) && \
		touch rehash.time; \
	else :; fi

test:   files tests


tests:  build_tests rehash
tests:  build_tests 
	@(cd test && echo "testing..." && \
	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
	@if [ -z "$(CROSS_COMPILE)" ]; then \
Loading