projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove CYGWIN codeblocks, drop vendored Windows openvpn, drop win32 specific files.
[oweals/gnunet.git]
/
src
/
vpn
/
Makefile.am
diff --git
a/src/vpn/Makefile.am
b/src/vpn/Makefile.am
index fea89724d0de47a53e18805459cb5bf44e8f6610..3ad9b1a5441502deefcff5800492d55d174e8205 100644
(file)
--- a/
src/vpn/Makefile.am
+++ b/
src/vpn/Makefile.am
@@
-1,8
+1,5
@@
-INCLUDES = -I$(top_srcdir)/src/include
-
-if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
@@
-10,6
+7,8
@@
endif
pkgcfgdir= $(pkgdatadir)/config.d/
pkgcfgdir= $(pkgdatadir)/config.d/
+libexecdir= $(pkglibdir)/libexec/
+
plugindir = $(libdir)/gnunet
pkgcfg_DATA = \
plugindir = $(libdir)/gnunet
pkgcfg_DATA = \
@@
-18,8
+17,7
@@
pkgcfg_DATA = \
if LINUX
VPNBIN = gnunet-helper-vpn
install-exec-hook:
if LINUX
VPNBIN = gnunet-helper-vpn
install-exec-hook:
- $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
- $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
+ $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
else
install-exec-hook:
endif
else
install-exec-hook:
endif
@@
-29,31
+27,23
@@
lib_LTLIBRARIES = \
libgnunetvpn.la
libgnunetvpn.la
-bin_PROGRAMS = \
- $(VPNBIN) gnunet-service-vpn gnunet-vpn
-
-
-if HAVE_MHD
- VPN_TEST = test_gnunet_vpn
-endif
-
-check_PROGRAMS = $(VPN_TEST)
-
-if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS)
-endif
+libexec_PROGRAMS = \
+ $(VPNBIN) \
+ gnunet-service-vpn
+bin_PROGRAMS = \
+ gnunet-vpn
gnunet_helper_vpn_SOURCES = \
gnunet_helper_vpn_SOURCES = \
-
gnunet-helper-vpn.c
+gnunet-helper-vpn.c
gnunet_service_vpn_SOURCES = \
gnunet_service_vpn_SOURCES = \
- gnunet-service-vpn.c
+ gnunet-service-vpn.c
gnunet_service_vpn_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
gnunet_service_vpn_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/tun/libgnunettun.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/regex/libgnunetregex.la \
$(GN_LIBINTL)
gnunet_service_vpn_CFLAGS = \
-I$(top_srcdir)/src/exit $(CFLAGS)
$(GN_LIBINTL)
gnunet_service_vpn_CFLAGS = \
-I$(top_srcdir)/src/exit $(CFLAGS)
@@
-61,11
+51,9
@@
gnunet_service_vpn_CFLAGS = \
gnunet_vpn_SOURCES = \
gnunet-vpn.c
gnunet_vpn_LDADD = \
gnunet_vpn_SOURCES = \
gnunet-vpn.c
gnunet_vpn_LDADD = \
-
$(top_builddir)/src/vpn/
libgnunetvpn.la \
+ libgnunetvpn.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
-gnunet_vpn_DEPENDENCIES = \
- libgnunetvpn.la
libgnunetvpn_la_SOURCES = \
vpn_api.c vpn.h
libgnunetvpn_la_SOURCES = \
vpn_api.c vpn.h
@@
-73,11
+61,3
@@
libgnunetvpn_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB)
libgnunetvpn_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
$(top_builddir)/src/util/libgnunetutil.la $(XLIB)
libgnunetvpn_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
-
-
-test_gnunet_vpn_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
- $(top_builddir)/src/util/libgnunetutil.la