projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm_arch.h: allow to specify __ARM_ARCH__ elsewhere.
[oweals/openssl.git]
/
crypto
/
conf
/
Makefile
diff --git
a/crypto/conf/Makefile
b/crypto/conf/Makefile
index 1c039081d09b605a6ea31103c1c0cf511e4d7ec1..c00e818853cd853483d906c75a068568d2055952 100644
(file)
--- a/
crypto/conf/Makefile
+++ b/
crypto/conf/Makefile
@@
-1,5
+1,5
@@
#
#
-#
SSLeay
/crypto/conf/Makefile
+#
OpenSSL
/crypto/conf/Makefile
#
DIR= conf
#
DIR= conf
@@
-7,12
+7,6
@@
TOP= ../..
CC= cc
INCLUDES= -I.. -I$(TOP) -I../../include
CFLAG=-g
CC= cc
INCLUDES= -I.. -I$(TOP) -I../../include
CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR= /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKE= make
-MAKEDEPPROG= makedepend
-MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
MAKEFILE= Makefile
AR= ar r
MAKEFILE= Makefile
AR= ar r
@@
-42,7
+36,7
@@
top:
all: lib
lib: $(LIBOBJ)
all: lib
lib: $(LIBOBJ)
- $(AR) $(LIB) $(LIBOBJ)
+ $(AR
X
) $(LIB) $(LIBOBJ)
$(RANLIB) $(LIB) || echo Never mind.
@touch lib
$(RANLIB) $(LIB) || echo Never mind.
@touch lib
@@
-55,6
+49,7
@@
links:
@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
install:
@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
install:
+ @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@
-70,6
+65,7
@@
lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
+ @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
dclean:
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
dclean: