summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-18 18:43:56 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-19 11:06:54 +0100
commit3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee (patch)
tree59e5462b3f76ce4de66c9b5dc8243f5d8f632670 /apps
parent5be5e56c09015633d94fb1ee1290081a78074546 (diff)
Rethink the uplink / applink story
Adding uplink and applink to some builds was done by "magic", the configuration for "mingw" only had a macro definition, the Configure would react to its presence by adding the uplink source files to cpuid_asm_src, and crypto/build.info inherited dance to get it compiled, and Makefile.shared made sure applink.o would be appropriately linked in. That was a lot under the hood. To replace this, we create a few template configurations in Configurations/00-base-templates.conf, inherit one of them in the "mingw" configuration, the rest is just about refering to the $target{apps_aux_src} / $target{apps_obj} in the right places. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile.in4
-rw-r--r--apps/build.info2
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/Makefile.in b/apps/Makefile.in
index d49afece36..956d84b4d7 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -15,6 +15,8 @@ PLIB_LDFLAG=
EX_LIBS=
EXE_EXT=
+APPS_OBJ=
+
SHLIB_TARGET=
CFLAGS= $(INCLUDES) $(CFLAG)
@@ -52,7 +54,7 @@ SRC = \
s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \
srp.c ts.c verify.c version.c x509.c rehash.c
-EXE_OBJ = openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ)
+EXE_OBJ = openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ) $(APPS_OBJ)
EXE_SRC = openssl.c $(SRC) $(EXTRA_SRC) $(RAND_SRC)
HEADER= apps.h progs.h s_apps.h \
diff --git a/apps/build.info b/apps/build.info
index a7dcee6e1a..d581aad4bf 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -10,7 +10,7 @@ SOURCE[openssl]=\
srp.c ts.c verify.c version.c x509.c rehash.c \
apps.c opt.c s_cb.c s_socket.c \
app_rand.c \
- {- $target{apps_extra_src} -}
+ {- $target{apps_aux_src} -}
INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[openssl]=../libssl