projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The mix of CFLAGS and LDFLAGS is a bit confusing in my opinion, and
[openssl.git]
/
apps
/
Makefile.ssl
diff --git
a/apps/Makefile.ssl
b/apps/Makefile.ssl
index 843fe1e6157b15499c9f115c6549b15b28c2ce89..dc5b3d77548bf84b04e5435a0cc7afbfd298f06a 100644
(file)
--- a/
apps/Makefile.ssl
+++ b/
apps/Makefile.ssl
@@
-94,8
+94,8
@@
req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
shlib_target="$(SHLIB_TARGET)"; \
fi; \
$(NEWMAKE) -f $(TOP)/Makefile.shared \
shlib_target="$(SHLIB_TARGET)"; \
fi; \
$(NEWMAKE) -f $(TOP)/Makefile.shared \
- APPNAME=req CC="$(CC)"
LDFLAGS="$(CFLAG
)" \
- SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+ APPNAME=req CC="$(CC)"
CFLAGS="$(CFLAGS
)" \
+
LDFLAGS="$(LDFLAG)"
SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
LIBRPATH=$(INSTALLTOP)/lib \
OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
LIBRPATH=$(INSTALLTOP)/lib \
@@
-165,8
+165,8
@@
$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
fi; \
$(NEWMAKE) -f $(TOP)/Makefile.shared \
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
fi; \
$(NEWMAKE) -f $(TOP)/Makefile.shared \
- APPNAME=$(EXE) CC="$(CC)"
LDFLAGS="$(LD
FLAG)" \
- SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
+ APPNAME=$(EXE) CC="$(CC)"
CFLAGS="$(C
FLAG)" \
+
LDFLAGS="$(LDFLAGS)"
SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
OBJECTS="$(PROGRAM).o $(E_OBJ)" \
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
LIBRPATH=$(INSTALLTOP)/lib \
OBJECTS="$(PROGRAM).o $(E_OBJ)" \
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
LIBRPATH=$(INSTALLTOP)/lib \