blob: 8c4942c9940edf6c5ae3ec9142b20111675def65 [file] [log] [blame]
Index: openvpn/Makefile.am
===================================================================
--- openvpn.orig/Makefile.am
+++ openvpn/Makefile.am
@@ -50,26 +50,16 @@ BUILT_SOURCES = \
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 \
Index: openvpn/src/Makefile.am
===================================================================
--- openvpn.orig/src/Makefile.am
+++ openvpn/src/Makefile.am
@@ -12,4 +12,4 @@
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in
-SUBDIRS = compat openvpn openvpnmsica openvpnserv plugins tapctl
+SUBDIRS = compat openvpn plugins
Index: openvpn/src/openvpn/Makefile.am
===================================================================
--- openvpn.orig/src/openvpn/Makefile.am
+++ openvpn/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
Index: openvpn/src/plugins/Makefile.am
===================================================================
--- openvpn.orig/src/plugins/Makefile.am
+++ openvpn/src/plugins/Makefile.am
@@ -12,4 +12,4 @@
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in
-SUBDIRS = auth-pam down-root
+SUBDIRS = down-root
Index: openvpn/configure.ac
===================================================================
--- 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.
#
-include $(top_srcdir)/build/ltrc.inc
+include $(top_srcdir)/ltrc.inc
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
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.
#
-include $(top_srcdir)/build/ltrc.inc
+include $(top_srcdir)/ltrc.inc
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in