diff options
author | Ben Laurie <ben@openssl.org> | 2004-03-11 12:31:43 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 2004-03-11 12:31:43 +0000 |
commit | 6e07f8a4ba8758dcba4966d9fa4601d1dc52dc60 (patch) | |
tree | b75e7a7d10086954549e1530a117d273e6836cab /fips | |
parent | a82d1527c4effe4e240412662fe9ba386d535e68 (diff) |
Finish elimination of Makefile.ssl
Diffstat (limited to 'fips')
-rw-r--r-- | fips/Makefile | 6 | ||||
-rw-r--r-- | fips/aes/Makefile | 6 | ||||
-rw-r--r-- | fips/des/Makefile | 6 | ||||
-rw-r--r-- | fips/dsa/Makefile | 6 | ||||
-rw-r--r-- | fips/rand/Makefile | 6 | ||||
-rw-r--r-- | fips/rsa/Makefile | 6 | ||||
-rw-r--r-- | fips/sha1/Makefile | 6 |
7 files changed, 14 insertions, 28 deletions
diff --git a/fips/Makefile b/fips/Makefile index ad2f92b47c..474136e25c 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -11,10 +11,9 @@ CFLAG= -g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP= /usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile RM= rm -f AR= ar r @@ -66,7 +65,7 @@ sub_target: done; files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO @for i in $(FDIRS) ;\ do \ (cd $$i && echo "making 'files' in fips/$$i..." && \ @@ -74,7 +73,6 @@ files: done; links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) @for i in $(FDIRS); do \ (cd $$i && echo "making links in fips/$$i..." && \ diff --git a/fips/aes/Makefile b/fips/aes/Makefile index 33f6cf2bdd..b085d43122 100644 --- a/fips/aes/Makefile +++ b/fips/aes/Makefile @@ -10,10 +10,9 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -48,10 +47,9 @@ lib: $(LIBOBJ) @sleep 2; touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA) diff --git a/fips/des/Makefile b/fips/des/Makefile index 017fb325c0..cb01f974a2 100644 --- a/fips/des/Makefile +++ b/fips/des/Makefile @@ -10,10 +10,9 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) -g @@ -47,10 +46,9 @@ lib: $(LIBOBJ) @sleep 2; touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile index eb94ad8e74..7f7c81f7e0 100644 --- a/fips/dsa/Makefile +++ b/fips/dsa/Makefile @@ -10,10 +10,9 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +46,9 @@ check: TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) diff --git a/fips/rand/Makefile b/fips/rand/Makefile index 0248ecc933..dfb7a10de8 100644 --- a/fips/rand/Makefile +++ b/fips/rand/Makefile @@ -10,10 +10,9 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +46,9 @@ lib: $(LIBOBJ) @sleep 2; touch lib files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile index 8306397507..91c2d49c27 100644 --- a/fips/rsa/Makefile +++ b/fips/rsa/Makefile @@ -10,10 +10,9 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -47,10 +46,9 @@ check: TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER) files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS) diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile index 75b5debdef..c579f2f273 100644 --- a/fips/sha1/Makefile +++ b/fips/sha1/Makefile @@ -10,10 +10,9 @@ CFLAG=-g INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl -MAKE= make -f Makefile.ssl MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) -MAKEFILE= Makefile.ssl +MAKEFILE= Makefile AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) @@ -56,10 +55,9 @@ fips_standalone_sha1: fips_standalone_sha1.o fips_sha1dgst.o fips_sha1dgst.o files: - $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO links: - @$(TOP)/util/point.sh Makefile.ssl Makefile @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA) |