1 files changed, 2 insertions, 114 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 20cf586..60d0c60 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,117 +1,5 @@
 include $(top_srcdir)/Makefile.am.common
-bin_PROGRAMS = openssl
+SUBDIRS = openssl nc
-openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
+EXTRA_DIST = CMakeLists.txt
-openssl_LDADD += $(top_builddir)/ssl/libssl.la
-openssl_LDADD += $(top_builddir)/crypto/libcrypto.la
-openssl_SOURCES = apps.c
-openssl_SOURCES += asn1pars.c
-openssl_SOURCES += ca.c
-openssl_SOURCES += ciphers.c
-openssl_SOURCES += cms.c
-openssl_SOURCES += crl.c
-openssl_SOURCES += crl2p7.c
-openssl_SOURCES += dgst.c
-openssl_SOURCES += dh.c
-openssl_SOURCES += dhparam.c
-openssl_SOURCES += dsa.c
-openssl_SOURCES += dsaparam.c
-openssl_SOURCES += ec.c
-openssl_SOURCES += ecparam.c
-openssl_SOURCES += enc.c
-openssl_SOURCES += errstr.c
-openssl_SOURCES += gendh.c
-openssl_SOURCES += gendsa.c
-openssl_SOURCES += genpkey.c
-openssl_SOURCES += genrsa.c
-openssl_SOURCES += nseq.c
-openssl_SOURCES += ocsp.c
-openssl_SOURCES += openssl.c
-openssl_SOURCES += passwd.c
-openssl_SOURCES += pkcs12.c
-openssl_SOURCES += pkcs7.c
-openssl_SOURCES += pkcs8.c
-openssl_SOURCES += pkey.c
-openssl_SOURCES += pkeyparam.c
-openssl_SOURCES += pkeyutl.c
-openssl_SOURCES += prime.c
-openssl_SOURCES += rand.c
-openssl_SOURCES += req.c
-openssl_SOURCES += rsa.c
-openssl_SOURCES += rsautl.c
-openssl_SOURCES += s_cb.c
-openssl_SOURCES += s_client.c
-openssl_SOURCES += s_server.c
-openssl_SOURCES += s_socket.c
-openssl_SOURCES += s_time.c
-openssl_SOURCES += sess_id.c
-openssl_SOURCES += smime.c
-openssl_SOURCES += speed.c
-openssl_SOURCES += spkac.c
-openssl_SOURCES += ts.c
-openssl_SOURCES += verify.c
-openssl_SOURCES += version.c
-openssl_SOURCES += x509.c
-if BUILD_CERTHASH
-openssl_SOURCES += certhash.c
-else
-openssl_SOURCES += certhash_disabled.c
-endif
-if HOST_WIN
-openssl_SOURCES += apps_win.c
-else
-openssl_SOURCES += apps_posix.c
-endif
-if !HAVE_POLL
-if HOST_WIN
-openssl_SOURCES += poll_win.c
-endif
-endif
-if !HAVE_STRTONUM
-openssl_SOURCES += strtonum.c
-endif
-noinst_HEADERS = apps.h
-noinst_HEADERS += progs.h
-noinst_HEADERS += s_apps.h
-noinst_HEADERS += testdsa.h
-noinst_HEADERS += testrsa.h
-noinst_HEADERS += timeouts.h
-EXTRA_DIST = cert.pem
-EXTRA_DIST += openssl.cnf
-EXTRA_DIST += x509v3.cnf
-EXTRA_DIST += CMakeLists.txt
-install-exec-hook:
-        @if [ "@OPENSSLDIR@x" != "x" ]; then \
-                OPENSSLDIR="$(DESTDIR)/@OPENSSLDIR@"; \
-        else \
-                OPENSSLDIR="$(DESTDIR)/$(sysconfdir)/ssl"; \
-        fi; \
-        mkdir -p "$$OPENSSLDIR/certs"; \
-        for i in cert.pem openssl.cnf x509v3.cnf; do \
-                if [ ! -f "$$OPENSSLDIR/$i" ]; then \
-                        $(INSTALL) -m 644 "$(srcdir)/$$i" "$$OPENSSLDIR/$$i"; \
-                else \
-                        echo " $$OPENSSLDIR/$$i already exists, install will not overwrite"; \
-                fi \
-        done
-uninstall-local:
-        @if [ "@OPENSSLDIR@x" != "x" ]; then \
-                OPENSSLDIR="$(DESTDIR)/@OPENSSLDIR@"; \
-        else \
-                OPENSSLDIR="$(DESTDIR)/$(sysconfdir)/ssl"; \
-        fi; \
-        for i in cert.pem openssl.cnf x509v3.cnf; do \
-                if cmp -s "$$OPENSSLDIR/$$i" "$(srcdir)/$$i"; then \
-                        rm -f "$$OPENSSLDIR/$$i"; \
-                fi \
-        done

diff --git a/apps/Makefile.am b/apps/Makefile.am index 20cf586..60d0c60 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am
@@ -1,117 +1,5 @@
1	include $(top_srcdir)/Makefile.am.common	1	include $(top_srcdir)/Makefile.am.common
2		2
3	bin_PROGRAMS = openssl	3	SUBDIRS = openssl nc
4		4
5	openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)	5	EXTRA_DIST = CMakeLists.txt
6	openssl_LDADD += $(top_builddir)/ssl/libssl.la
7	openssl_LDADD += $(top_builddir)/crypto/libcrypto.la
8
9	openssl_SOURCES = apps.c
10	openssl_SOURCES += asn1pars.c
11	openssl_SOURCES += ca.c
12	openssl_SOURCES += ciphers.c
13	openssl_SOURCES += cms.c
14	openssl_SOURCES += crl.c
15	openssl_SOURCES += crl2p7.c
16	openssl_SOURCES += dgst.c
17	openssl_SOURCES += dh.c
18	openssl_SOURCES += dhparam.c
19	openssl_SOURCES += dsa.c
20	openssl_SOURCES += dsaparam.c
21	openssl_SOURCES += ec.c
22	openssl_SOURCES += ecparam.c
23	openssl_SOURCES += enc.c
24	openssl_SOURCES += errstr.c
25	openssl_SOURCES += gendh.c
26	openssl_SOURCES += gendsa.c
27	openssl_SOURCES += genpkey.c
28	openssl_SOURCES += genrsa.c
29	openssl_SOURCES += nseq.c
30	openssl_SOURCES += ocsp.c
31	openssl_SOURCES += openssl.c
32	openssl_SOURCES += passwd.c
33	openssl_SOURCES += pkcs12.c
34	openssl_SOURCES += pkcs7.c
35	openssl_SOURCES += pkcs8.c
36	openssl_SOURCES += pkey.c
37	openssl_SOURCES += pkeyparam.c
38	openssl_SOURCES += pkeyutl.c
39	openssl_SOURCES += prime.c
40	openssl_SOURCES += rand.c
41	openssl_SOURCES += req.c
42	openssl_SOURCES += rsa.c
43	openssl_SOURCES += rsautl.c
44	openssl_SOURCES += s_cb.c
45	openssl_SOURCES += s_client.c
46	openssl_SOURCES += s_server.c
47	openssl_SOURCES += s_socket.c
48	openssl_SOURCES += s_time.c
49	openssl_SOURCES += sess_id.c
50	openssl_SOURCES += smime.c
51	openssl_SOURCES += speed.c
52	openssl_SOURCES += spkac.c
53	openssl_SOURCES += ts.c
54	openssl_SOURCES += verify.c
55	openssl_SOURCES += version.c
56	openssl_SOURCES += x509.c
57
58	if BUILD_CERTHASH
59	openssl_SOURCES += certhash.c
60	else
61	openssl_SOURCES += certhash_disabled.c
62	endif
63
64	if HOST_WIN
65	openssl_SOURCES += apps_win.c
66	else
67	openssl_SOURCES += apps_posix.c
68	endif
69
70	if !HAVE_POLL
71	if HOST_WIN
72	openssl_SOURCES += poll_win.c
73	endif
74	endif
75
76	if !HAVE_STRTONUM
77	openssl_SOURCES += strtonum.c
78	endif
79
80	noinst_HEADERS = apps.h
81	noinst_HEADERS += progs.h
82	noinst_HEADERS += s_apps.h
83	noinst_HEADERS += testdsa.h
84	noinst_HEADERS += testrsa.h
85	noinst_HEADERS += timeouts.h
86
87	EXTRA_DIST = cert.pem
88	EXTRA_DIST += openssl.cnf
89	EXTRA_DIST += x509v3.cnf
90	EXTRA_DIST += CMakeLists.txt
91
92	install-exec-hook:
93	@if [ "@OPENSSLDIR@x" != "x" ]; then \
94	OPENSSLDIR="$(DESTDIR)/@OPENSSLDIR@"; \
95	else \
96	OPENSSLDIR="$(DESTDIR)/$(sysconfdir)/ssl"; \
97	fi; \
98	mkdir -p "$$OPENSSLDIR/certs"; \
99	for i in cert.pem openssl.cnf x509v3.cnf; do \
100	if [ ! -f "$$OPENSSLDIR/$i" ]; then \
101	$(INSTALL) -m 644 "$(srcdir)/$$i" "$$OPENSSLDIR/$$i"; \
102	else \
103	echo " $$OPENSSLDIR/$$i already exists, install will not overwrite"; \
104	fi \
105	done
106
107	uninstall-local:
108	@if [ "@OPENSSLDIR@x" != "x" ]; then \
109	OPENSSLDIR="$(DESTDIR)/@OPENSSLDIR@"; \
110	else \
111	OPENSSLDIR="$(DESTDIR)/$(sysconfdir)/ssl"; \
112	fi; \
113	for i in cert.pem openssl.cnf x509v3.cnf; do \
114	if cmp -s "$$OPENSSLDIR/$$i" "$(srcdir)/$$i"; then \
115	rm -f "$$OPENSSLDIR/$$i"; \
116	fi \
117	done