From 5fc5d37330d3535a0f421632694d1e7918fc22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 11:38:09 +0200 Subject: Compiles correctly: app/build-native + gradle. --- app/openvpn/sample/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app/openvpn/sample/Makefile.am (limited to 'app/openvpn/sample/Makefile.am') diff --git a/app/openvpn/sample/Makefile.am b/app/openvpn/sample/Makefile.am new file mode 100644 index 00000000..be30c88a --- /dev/null +++ b/app/openvpn/sample/Makefile.am @@ -0,0 +1,34 @@ +# +# OpenVPN -- An application to securely tunnel IP networks +# over a single UDP port, with support for SSL/TLS-based +# session authentication and key exchange, +# packet encryption, packet authentication, and +# packet compression. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. +# Copyright (C) 2006-2012 Alon Bar-Lev +# + +MAINTAINERCLEANFILES = \ + $(srcdir)/Makefile.in + +EXTRA_DIST = \ + sample-plugins \ + sample-config-files \ + sample-windows \ + sample-keys \ + sample-scripts + +if WIN32 +sample_DATA = \ + client.ovpn \ + server.ovpn \ + sample-windows/sample.ovpn + +client.ovpn: sample-config-files/client.conf + -rm -f client.ovpn + cp "$(srcdir)/sample-config-files/client.conf" client.ovpn +server.ovpn: sample-config-files/server.conf + -rm -f server.ovpn + cp "$(srcdir)/sample-config-files/server.conf" server.ovpn +endif -- cgit v1.2.3 From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- app/openvpn/sample/Makefile.am | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 app/openvpn/sample/Makefile.am (limited to 'app/openvpn/sample/Makefile.am') diff --git a/app/openvpn/sample/Makefile.am b/app/openvpn/sample/Makefile.am deleted file mode 100644 index be30c88a..00000000 --- a/app/openvpn/sample/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# OpenVPN -- An application to securely tunnel IP networks -# over a single UDP port, with support for SSL/TLS-based -# session authentication and key exchange, -# packet encryption, packet authentication, and -# packet compression. -# -# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. -# Copyright (C) 2006-2012 Alon Bar-Lev -# - -MAINTAINERCLEANFILES = \ - $(srcdir)/Makefile.in - -EXTRA_DIST = \ - sample-plugins \ - sample-config-files \ - sample-windows \ - sample-keys \ - sample-scripts - -if WIN32 -sample_DATA = \ - client.ovpn \ - server.ovpn \ - sample-windows/sample.ovpn - -client.ovpn: sample-config-files/client.conf - -rm -f client.ovpn - cp "$(srcdir)/sample-config-files/client.conf" client.ovpn -server.ovpn: sample-config-files/server.conf - -rm -f server.ovpn - cp "$(srcdir)/sample-config-files/server.conf" server.ovpn -endif -- cgit v1.2.3 From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 9 Apr 2014 16:03:55 +0200 Subject: Back to the standard "app" module. This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure I'll have to tweak the final apk name in build.gradle. --- app/openvpn/sample/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app/openvpn/sample/Makefile.am (limited to 'app/openvpn/sample/Makefile.am') diff --git a/app/openvpn/sample/Makefile.am b/app/openvpn/sample/Makefile.am new file mode 100644 index 00000000..be30c88a --- /dev/null +++ b/app/openvpn/sample/Makefile.am @@ -0,0 +1,34 @@ +# +# OpenVPN -- An application to securely tunnel IP networks +# over a single UDP port, with support for SSL/TLS-based +# session authentication and key exchange, +# packet encryption, packet authentication, and +# packet compression. +# +# Copyright (C) 2002-2010 OpenVPN Technologies, Inc. +# Copyright (C) 2006-2012 Alon Bar-Lev +# + +MAINTAINERCLEANFILES = \ + $(srcdir)/Makefile.in + +EXTRA_DIST = \ + sample-plugins \ + sample-config-files \ + sample-windows \ + sample-keys \ + sample-scripts + +if WIN32 +sample_DATA = \ + client.ovpn \ + server.ovpn \ + sample-windows/sample.ovpn + +client.ovpn: sample-config-files/client.conf + -rm -f client.ovpn + cp "$(srcdir)/sample-config-files/client.conf" client.ovpn +server.ovpn: sample-config-files/server.conf + -rm -f server.ovpn + cp "$(srcdir)/sample-config-files/server.conf" server.ovpn +endif -- cgit v1.2.3