Disseminate BUILDENV even further.
This commit is contained in:
parent
31e4ad25ba
commit
4976983f30
2 changed files with 3 additions and 3 deletions
|
@ -86,7 +86,7 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
|
||||||
shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
|
shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
|
||||||
shlib_target="$(SHLIB_TARGET)"; \
|
shlib_target="$(SHLIB_TARGET)"; \
|
||||||
fi; \
|
fi; \
|
||||||
$(MAKE) -f $(TOP)/Makefile.shared \
|
$(MAKE) -f $(TOP)/Makefile.shared $(BUILDENV) \
|
||||||
APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
|
APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \
|
||||||
LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
|
LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \
|
||||||
link_app.$${shlib_target}
|
link_app.$${shlib_target}
|
||||||
|
@ -158,7 +158,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
|
||||||
else \
|
else \
|
||||||
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
|
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
|
||||||
fi; \
|
fi; \
|
||||||
$(MAKE) -f $(TOP)/Makefile.shared \
|
$(MAKE) -f $(TOP)/Makefile.shared $(BUILDENV) \
|
||||||
APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
|
APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
|
||||||
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
|
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
|
||||||
link_app.$${shlib_target}
|
link_app.$${shlib_target}
|
||||||
|
|
|
@ -312,7 +312,7 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
|
||||||
else \
|
else \
|
||||||
LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \
|
LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \
|
||||||
fi; \
|
fi; \
|
||||||
$(MAKE) -f $(TOP)/Makefile.shared \
|
$(MAKE) -f $(TOP)/Makefile.shared $(BUILDENV) \
|
||||||
APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
|
APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
|
||||||
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
|
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
|
||||||
link_app.$${shlib_target}
|
link_app.$${shlib_target}
|
||||||
|
|
Loading…
Reference in a new issue