X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.am;h=c93a86a0979b0f61342abb67f67a9055e1552fe9;hp=55d926b9d5e2dbf17b49caab823fbe1b4aa5ecfd;hb=HEAD;hpb=35198adc7f3c1f0c1e3437f983e7f3ac96477997

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 55d926b..65880ab 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -2,7 +2,7 @@ sbin_PROGRAMS = pppd
 dist_man8_MANS = pppd.8
 check_PROGRAMS =
 
-utest_chap_SOURCES = chap_ms.c utils.c pppcrypt.c
+utest_chap_SOURCES = chap_ms.c utils.c crypto_ms.c
 utest_chap_CPPFLAGS = -DUNIT_TEST
 utest_chap_LDFLAGS =
 
@@ -10,16 +10,22 @@ utest_peap_SOURCES = peap.c utils.c mppe.c
 utest_peap_CPPFLAGS = -DUNIT_TEST
 utest_peap_LDFLAGS =
 
-utest_crypto_SOURCES = ppp-crypto.c
+utest_crypto_SOURCES = crypto.c
 utest_crypto_CPPFLAGS = -DUNIT_TEST
 utest_crypto_LDFLAGS =
 
-utest_pppcrypt_SOURCES = pppcrypt.c
-utest_pppcrypt_CPPFLAGS = -DUNIT_TEST_PPPCRYPT
+utest_pppcrypt_SOURCES = crypto_ms.c
+utest_pppcrypt_CPPFLAGS = -DUNIT_TEST_MSCRYPTO
 utest_pppcrypt_LDFLAGS =
 
 check_PROGRAMS += utest_crypto
 
+utest_utils_SOURCES = utils.c utils_utest.c
+utest_utils_CPPFLAGS = -DUNIT_TEST
+utest_utils_LDFLAGS =
+
+check_PROGRAMS += utest_utils
+
 if WITH_SRP
 sbin_PROGRAMS += srp-entry
 dist_man8_MANS += srp-entry.8
@@ -32,11 +38,11 @@ pppd_includedir = $(includedir)/pppd
 pppd_include_HEADERS = \
     cbcp.h \
     ccp.h \
-    chap-md5.h \
+    chap.h \
     chap_ms.h \
-    chap-new.h \
+    crypto.h \
+    crypto_ms.h \
     eap.h \
-    eap-tls.h \
     ecp.h \
     eui64.h \
     fsm.h \
@@ -45,24 +51,30 @@ pppd_include_HEADERS = \
     lcp.h \
     magic.h \
     mppe.h \
-    pathnames.h \
-    peap.h \
+    multilink.h \
     pppd.h \
+    options.h \
     pppdconf.h \
-    pppcrypt.h \
-    ppp-crypto.h \
-    ppp-crypto-priv.h \
     session.h \
+    upap.h 
+
+# Headers to be distributed, but not installed in /usr/include/pppd
+noinst_HEADERS = \
+    chap-md5.h \
+    crypto-priv.h \
+    eap-tls.h \
+    pathnames.h \
+    peap.h \
+    pppd-private.h \
     spinlock.h \
     tls.h \
-    tdb.h \
-    upap.h 
+    tdb.h
 
 pppd_SOURCES = \
     auth.c \
     ccp.c \
     chap-md5.c \
-    chap-new.c \
+    chap.c \
     demand.c \
     eap.c \
     ecp.c \
@@ -77,12 +89,17 @@ pppd_SOURCES = \
     upap.c \
     utils.c
 
-pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
+pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
 pppd_LDFLAGS =
 pppd_LIBS =
 
+if PPP_WITH_SYSTEM_CA_PATH
+pppd_CPPFLAGS += -DSYSTEM_CA_PATH='"@SYSTEM_CA_PATH@"'
+endif
+
 if LINUX
-pppd_SOURCES += sys-linux.c termios_linux.h
+pppd_SOURCES += sys-linux.c
+noinst_HEADERS += termios_linux.h
 pppd_LIBS += $(CRYPT_LIBS) $(UTIL_LIBS)
 endif
 
@@ -93,12 +110,12 @@ pppd_LIBS += -lsocket -lnsl
 endif
 
 if PPP_WITH_CHAPMS
-pppd_SOURCES += chap_ms.c pppcrypt.c
+pppd_SOURCES += chap_ms.c crypto_ms.c
 check_PROGRAMS += utest_chap
 check_PROGRAMS += utest_pppcrypt
 else
 if WITH_SRP
-pppd_SOURCES += pppcrypt.c
+pppd_SOURCES += crypto_ms.c
 check_PROGRAMS += utest_pppcrypt
 endif
 endif
@@ -156,21 +173,23 @@ pppd_SOURCES += peap.c
 check_PROGRAMS += utest_peap
 endif
 
-noinst_LTLIBRARIES = libppp_crypt.la
-libppp_crypt_la_SOURCES=ppp-crypto.c ppp-md5.c ppp-md4.c ppp-sha1.c ppp-des.c
+noinst_LTLIBRARIES = libppp_crypto.la
+libppp_crypto_la_SOURCES=crypto.c ppp-md5.c ppp-md4.c ppp-sha1.c ppp-des.c
 
 if PPP_WITH_OPENSSL
-libppp_crypt_la_CPPFLAGS=$(OPENSSL_INCLUDES)
-libppp_crypt_la_LDFLAGS=$(OPENSSL_LDFLAGS)
-libppp_crypt_la_LIBADD=$(OPENSSL_LIBS)
+pppd_CPPFLAGS += $(OPENSSL_INCLUDES)
+
+libppp_crypto_la_CPPFLAGS=$(OPENSSL_INCLUDES)
+libppp_crypto_la_LDFLAGS=$(OPENSSL_LDFLAGS)
+libppp_crypto_la_LIBADD=$(OPENSSL_LIBS)
 endif
 
-utest_peap_LDADD = libppp_crypt.la
-utest_chap_LDADD = libppp_crypt.la
-utest_crypto_LDADD = libppp_crypt.la
-utest_pppcrypt_LDADD = libppp_crypt.la
+utest_peap_LDADD = libppp_crypto.la
+utest_chap_LDADD = libppp_crypto.la
+utest_crypto_LDADD = libppp_crypto.la
+utest_pppcrypt_LDADD = libppp_crypto.la
 
-pppd_LIBS += libppp_crypt.la
+pppd_LIBS += libppp_crypto.la
 
 if WITH_SYSTEMD
 pppd_CPPFLAGS += $(SYSTEMD_CFLAGS)