From: Richard Levitte <levitte@openssl.org>
Date: Wed, 28 Aug 2019 20:27:47 +0000 (+0200)
Subject: Move libapps.a source to apps/lib
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ad75c6c1341db8a3122bbeaf863440057d71307;p=openssl

Move libapps.a source to apps/lib

This makes it clearer what's what.  The 'openssl' application and its
sub-commands remain in apps/

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9723)
---

diff --git a/apps/build.info b/apps/build.info
index aa2c6a302d..f49edb4d44 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -1,3 +1,5 @@
+SUBDIRS=lib
+
 # Program init source, that don't have direct linkage with the rest of the
 # source, and can therefore not be part of a library.
 IF[{- !$disabled{uplink} -}]
@@ -7,37 +9,18 @@ IF[{- $config{target} =~ /^vms-/ -}]
   $INITSRC=vms_decc_init.c
 ENDIF
 
-# Auxilliary program source
-IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}]
-  # It's called 'init', but doesn't have much 'init' in it...
-  $AUXLIBAPPSSRC=win32_init.c
-ENDIF
-IF[{- $config{target} =~ /^vms-/ -}]
-  $AUXLIBAPPSSRC=vms_term_sock.c vms_decc_argv.c
-ENDIF
-
 # Source for the 'openssl' program
-# We need the perl variable for the DEPEND generator further down.
-$OPENSSLSRC={-
-   our @opensslsrc =
-       qw(openssl.c progs.c
-          asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c
-          dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c
-          genpkey.c genrsa.c kdf.c mac.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c
-          pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c
-          rsautl.c 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 storeutl.c
-          list.c info.c provider.c fipsinstall.c);
-   join(' ', @opensslsrc); -}
-# Source for libapps
-$LIBAPPSSRC=apps.c apps_ui.c opt.c fmt.c s_cb.c s_socket.c app_rand.c \
-        bf_prefix.c columns.c lib/app_params.c
+$OPENSSLSRC=\
+        openssl.c progs.c \
+        asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \
+        dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \
+        genpkey.c genrsa.c kdf.c mac.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c \
+        pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c \
+        rsautl.c 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 storeutl.c \
+        list.c info.c provider.c fipsinstall.c
 
 IF[{- !$disabled{apps} -}]
-  LIBS{noinst}=libapps.a
-  SOURCE[libapps.a]=$LIBAPPSSRC $AUXLIBAPPSSRC
-  INCLUDE[libapps.a]=.. ../include include
-
   PROGRAMS=openssl
   SOURCE[openssl]=$INITSRC $OPENSSLSRC
   INCLUDE[openssl]=.. ../include include
diff --git a/apps/vms_term_sock.h b/apps/include/vms_term_sock.h
similarity index 100%
rename from apps/vms_term_sock.h
rename to apps/include/vms_term_sock.h
diff --git a/apps/app_rand.c b/apps/lib/app_rand.c
similarity index 100%
rename from apps/app_rand.c
rename to apps/lib/app_rand.c
diff --git a/apps/apps.c b/apps/lib/apps.c
similarity index 100%
rename from apps/apps.c
rename to apps/lib/apps.c
diff --git a/apps/apps_ui.c b/apps/lib/apps_ui.c
similarity index 100%
rename from apps/apps_ui.c
rename to apps/lib/apps_ui.c
diff --git a/apps/bf_prefix.c b/apps/lib/bf_prefix.c
similarity index 100%
rename from apps/bf_prefix.c
rename to apps/lib/bf_prefix.c
diff --git a/apps/lib/build.info b/apps/lib/build.info
new file mode 100644
index 0000000000..f92d4dafc6
--- /dev/null
+++ b/apps/lib/build.info
@@ -0,0 +1,18 @@
+# Auxilliary program source
+IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}]
+  # It's called 'init', but doesn't have much 'init' in it...
+  $AUXLIBAPPSSRC=win32_init.c
+ENDIF
+IF[{- $config{target} =~ /^vms-/ -}]
+  $AUXLIBAPPSSRC=vms_term_sock.c vms_decc_argv.c
+ENDIF
+
+# Source for libapps
+$LIBAPPSSRC=apps.c apps_ui.c opt.c fmt.c s_cb.c s_socket.c app_rand.c \
+        bf_prefix.c columns.c app_params.c
+
+IF[{- !$disabled{apps} -}]
+  LIBS{noinst}=../libapps.a
+  SOURCE[../libapps.a]=$LIBAPPSSRC $AUXLIBAPPSSRC
+  INCLUDE[../libapps.a]=../.. ../../include ../include
+ENDIF
diff --git a/apps/columns.c b/apps/lib/columns.c
similarity index 100%
rename from apps/columns.c
rename to apps/lib/columns.c
diff --git a/apps/fmt.c b/apps/lib/fmt.c
similarity index 100%
rename from apps/fmt.c
rename to apps/lib/fmt.c
diff --git a/apps/opt.c b/apps/lib/opt.c
similarity index 100%
rename from apps/opt.c
rename to apps/lib/opt.c
diff --git a/apps/s_cb.c b/apps/lib/s_cb.c
similarity index 100%
rename from apps/s_cb.c
rename to apps/lib/s_cb.c
diff --git a/apps/s_socket.c b/apps/lib/s_socket.c
similarity index 100%
rename from apps/s_socket.c
rename to apps/lib/s_socket.c
diff --git a/apps/vms_decc_argv.c b/apps/lib/vms_decc_argv.c
similarity index 100%
rename from apps/vms_decc_argv.c
rename to apps/lib/vms_decc_argv.c
diff --git a/apps/vms_term_sock.c b/apps/lib/vms_term_sock.c
similarity index 100%
rename from apps/vms_term_sock.c
rename to apps/lib/vms_term_sock.c
diff --git a/apps/win32_init.c b/apps/lib/win32_init.c
similarity index 100%
rename from apps/win32_init.c
rename to apps/lib/win32_init.c
diff --git a/test/build.info b/test/build.info
index 595a0da2ae..eb344fd6c3 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,19 +1,20 @@
 SUBDIRS=ossl_shim
 
-# TODO: use ../apps/libapps.a instead of direct ../apps source.
+# TODO: use ../apps/libapps.a instead of direct ../apps/lib source.
 # This can't currently be done, because some of its units drag in too many
-# unresolved references that don't apply here.  Most of all, ../apps/apps.c
-# needs to be divided in smaller pieces to be useful here.
+# unresolved references that don't apply here.
+# Most of all, ../apps/lib/apps.c needs to be divided in smaller pieces to
+# be useful here.
 #
 # Auxilliary program source (copied from ../apps/build.info)
 IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}]
   # It's called 'init', but doesn't have much 'init' in it...
-  $AUXLIBAPPSSRC=../apps/win32_init.c
+  $AUXLIBAPPSSRC=../apps/lib/win32_init.c
 ENDIF
 IF[{- $config{target} =~ /^vms-/ -}]
-  $AUXLIBAPPSSRC=../apps/vms_term_sock.c ../apps/vms_decc_argv.c
+  $AUXLIBAPPSSRC=../apps/lib/vms_term_sock.c ../apps/lib/vms_decc_argv.c
 ENDIF
-$LIBAPPSSRC=../apps/opt.c ../apps/bf_prefix.c $AUXLIBAPPSSRC
+$LIBAPPSSRC=../apps/lib/opt.c ../apps/lib/bf_prefix.c $AUXLIBAPPSSRC
 
 IF[{- !$disabled{tests} -}]
   LIBS{noinst,has_main}=libtestutil.a
@@ -435,7 +436,7 @@ IF[{- !$disabled{tests} -}]
     DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
-  SOURCE[uitest]=uitest.c ../apps/apps_ui.c
+  SOURCE[uitest]=uitest.c ../apps/lib/apps_ui.c
   INCLUDE[uitest]=.. ../include ../apps/include
   DEPEND[uitest]=../libcrypto ../libssl libtestutil.a