Internal change PiperOrigin-RevId: 374262980 Change-Id: I6ea8d59489c6638cb7ac2518821ff2c88848b697
diff --git a/Makefile.am b/Makefile.am index d1c10fc..0951a54 100644 --- a/Makefile.am +++ b/Makefile.am
@@ -50,26 +50,16 @@ config-version.h endif -SUBDIRS = build distro include src sample doc tests +SUBDIRS = include src dist_doc_DATA = \ - README \ + README.openvpn \ README.IPv6 \ - README.mbedtls \ - Changes.rst \ - COPYRIGHT.GPL \ - COPYING + LICENSE dist_noinst_DATA = \ - .gitignore \ - .gitattributes \ - PORTS \ - README.IPv6 TODO.IPv6 \ - README.mbedtls \ - openvpn.sln \ - msvc-env.bat \ - msvc-dev.bat \ - msvc-build.bat + README.openvpn \ + README.IPv6 dist_noinst_HEADERS = \ config-msvc.h \
diff --git a/configure.ac b/configure.ac index ebb3220..78c12f0 100644 --- a/configure.ac +++ b/configure.ac
@@ -1424,33 +1424,12 @@ AC_CONFIG_FILES([ version.sh Makefile - build/Makefile - build/msvc/Makefile - build/msvc/msvc-generate/Makefile - distro/Makefile - distro/systemd/Makefile - doc/Makefile - doc/doxygen/Makefile - doc/doxygen/openvpn.doxyfile include/Makefile - sample/sample-plugins/Makefile src/Makefile src/compat/Makefile src/openvpn/Makefile - src/openvpnmsica/Makefile - src/openvpnserv/Makefile src/plugins/Makefile - src/plugins/auth-pam/Makefile src/plugins/down-root/Makefile src/tapctl/Makefile - tests/Makefile - tests/unit_tests/Makefile - tests/unit_tests/example_test/Makefile - tests/unit_tests/openvpn/Makefile - tests/unit_tests/plugins/Makefile - tests/unit_tests/plugins/auth-pam/Makefile - tests/unit_tests/engine-key/Makefile - sample/Makefile ]) -AC_CONFIG_FILES([tests/t_client.sh], [chmod +x tests/t_client.sh]) AC_OUTPUT
diff --git a/patches/cleanup_makefiles.patch b/patches/cleanup_makefiles.patch index 33c3a3b..8c4942c 100644 --- a/patches/cleanup_makefiles.patch +++ b/patches/cleanup_makefiles.patch
@@ -1,47 +1,39 @@ -Index: openvpn/configure.ac +Index: openvpn/Makefile.am =================================================================== ---- openvpn.orig/configure.ac -+++ openvpn/configure.ac -@@ -1312,10 +1312,6 @@ if test "${enable_werror}" = "yes"; then - CFLAGS="${CFLAGS} -Werror" - fi +--- openvpn.orig/Makefile.am ++++ openvpn/Makefile.am +@@ -50,26 +50,16 @@ BUILT_SOURCES = \ + config-version.h + endif --if test "${WIN32}" = "yes"; then -- test -z "${MAN2HTML}" && AC_MSG_ERROR([man2html is required for win32]) --fi -- - if test "${enable_plugin_auth_pam}" = "yes"; then - PLUGIN_AUTH_PAM_CFLAGS="${LIBPAM_CFLAGS}" - if test "${enable_pam_dlopen}" = "yes"; then -@@ -1418,28 +1414,11 @@ fi - AC_CONFIG_FILES([ - version.sh - Makefile -- build/Makefile -- build/msvc/Makefile -- build/msvc/msvc-generate/Makefile -- distro/Makefile -- distro/systemd/Makefile - include/Makefile - src/Makefile - src/compat/Makefile - src/openvpn/Makefile -- src/openvpnserv/Makefile - src/plugins/Makefile -- src/plugins/auth-pam/Makefile - src/plugins/down-root/Makefile -- tests/Makefile -- tests/unit_tests/Makefile -- tests/unit_tests/example_test/Makefile -- tests/unit_tests/openvpn/Makefile -- tests/unit_tests/plugins/Makefile -- tests/unit_tests/plugins/auth-pam/Makefile -- vendor/Makefile -- sample/Makefile -- doc/Makefile - ]) --AC_CONFIG_FILES([tests/t_client.sh], [chmod +x tests/t_client.sh]) - AC_OUTPUT +-SUBDIRS = build distro include src sample doc tests ++SUBDIRS = include src + + dist_doc_DATA = \ +- README \ ++ README.openvpn \ + README.IPv6 \ +- README.mbedtls \ +- Changes.rst \ +- COPYRIGHT.GPL \ +- COPYING ++ LICENSE + + dist_noinst_DATA = \ +- .gitignore \ +- .gitattributes \ +- PORTS \ +- README.IPv6 TODO.IPv6 \ +- README.mbedtls \ +- openvpn.sln \ +- msvc-env.bat \ +- msvc-dev.bat \ +- msvc-build.bat ++ README.openvpn \ ++ README.IPv6 + + dist_noinst_HEADERS = \ + config-msvc.h \ Index: openvpn/src/Makefile.am =================================================================== --- openvpn.orig/src/Makefile.am @@ -50,7 +42,7 @@ MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.in --SUBDIRS = compat openvpn openvpnserv plugins +-SUBDIRS = compat openvpn openvpnmsica openvpnserv plugins tapctl +SUBDIRS = compat openvpn plugins Index: openvpn/src/openvpn/Makefile.am =================================================================== @@ -75,38 +67,67 @@ -SUBDIRS = auth-pam down-root +SUBDIRS = down-root -Index: openvpn/Makefile.am +Index: openvpn/configure.ac =================================================================== ---- openvpn.orig/Makefile.am -+++ openvpn/Makefile.am -@@ -53,26 +53,14 @@ BUILT_SOURCES = \ - config-version.h - endif +--- openvpn.orig/configure.ac ++++ openvpn/configure.ac +@@ -1424,33 +1424,12 @@ AC_SUBST([TEST_CFLAGS]) + AC_CONFIG_FILES([ + version.sh + Makefile +- build/Makefile +- build/msvc/Makefile +- build/msvc/msvc-generate/Makefile +- distro/Makefile +- distro/systemd/Makefile +- doc/Makefile +- doc/doxygen/Makefile +- doc/doxygen/openvpn.doxyfile + include/Makefile +- sample/sample-plugins/Makefile + src/Makefile + src/compat/Makefile + src/openvpn/Makefile +- src/openvpnmsica/Makefile +- src/openvpnserv/Makefile + src/plugins/Makefile +- src/plugins/auth-pam/Makefile + src/plugins/down-root/Makefile + src/tapctl/Makefile +- tests/Makefile +- tests/unit_tests/Makefile +- tests/unit_tests/example_test/Makefile +- tests/unit_tests/openvpn/Makefile +- tests/unit_tests/plugins/Makefile +- tests/unit_tests/plugins/auth-pam/Makefile +- tests/unit_tests/engine-key/Makefile +- sample/Makefile + ]) +-AC_CONFIG_FILES([tests/t_client.sh], [chmod +x tests/t_client.sh]) + AC_OUTPUT +Index: openvpn/src/openvpnmsica/Makefile.am +=================================================================== +--- openvpn.orig/src/openvpnmsica/Makefile.am ++++ openvpn/src/openvpnmsica/Makefile.am +@@ -18,7 +18,7 @@ + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # --SUBDIRS = build distro include src sample doc vendor tests -+SUBDIRS = include src +-include $(top_srcdir)/build/ltrc.inc ++include $(top_srcdir)/ltrc.inc - dist_doc_DATA = \ -- README \ -- README.IPv6 \ -- README.mbedtls \ -- Changes.rst \ -- COPYRIGHT.GPL \ -- COPYING -+ README.IPv6 -+ LICENSE + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in - dist_noinst_DATA = \ -- .gitignore \ -- .gitattributes \ -- PORTS \ -- README.IPv6 TODO.IPv6 \ -- README.mbedtls \ -- openvpn.sln \ -- msvc-env.bat \ -- msvc-dev.bat \ -- msvc-build.bat -+ README.IPv6 +Index: openvpn/src/tapctl/Makefile.am +=================================================================== +--- openvpn.orig/src/tapctl/Makefile.am ++++ openvpn/src/tapctl/Makefile.am +@@ -18,7 +18,7 @@ + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # - dist_noinst_HEADERS = \ - config-msvc.h \ +-include $(top_srcdir)/build/ltrc.inc ++include $(top_srcdir)/ltrc.inc + + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in +
diff --git a/patches/series b/patches/series index f7b5bd2..c79e662 100644 --- a/patches/series +++ b/patches/series
@@ -1,3 +1,4 @@ remove_autoconf_vars.patch add_missing_licenses.patch fix_long_password.patch +cleanup_makefiles.patch
diff --git a/src/Makefile.am b/src/Makefile.am index 313d289..14bca42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am
@@ -12,4 +12,4 @@ MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.in -SUBDIRS = compat openvpn openvpnmsica openvpnserv plugins tapctl +SUBDIRS = compat openvpn plugins
diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index 37b002c..a1de36c 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am
@@ -9,7 +9,7 @@ # Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com> # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.in
diff --git a/src/openvpnmsica/Makefile.am b/src/openvpnmsica/Makefile.am index 9d18854..5876581 100644 --- a/src/openvpnmsica/Makefile.am +++ b/src/openvpnmsica/Makefile.am
@@ -18,7 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index f346178..b1358d9 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am
@@ -12,4 +12,4 @@ MAINTAINERCLEANFILES = \ $(srcdir)/Makefile.in -SUBDIRS = auth-pam down-root +SUBDIRS = down-root
diff --git a/src/tapctl/Makefile.am b/src/tapctl/Makefile.am index 583a45f..d182e3e 100644 --- a/src/tapctl/Makefile.am +++ b/src/tapctl/Makefile.am
@@ -18,7 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES = $(srcdir)/Makefile.in