Make testuite run properly to make make distcheck happy

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 22c88ad055c40d119a0e251da0e678be360b8f2d..e59995cf91cff3f8bec23bae2414bb7f5dba7f91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,10 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
+configdir        = $(sysconfdir)/network
 bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
-pkgconfigdatadir = $(datadir)/pkgconfig
+pkgconfigdir     = $(libdir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
 systemconfigdir  = $(datadir)/network
 sysctldir        = $(prefix)/lib/sysctl.d
@@ -59,9 +60,21 @@ INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
 
-AM_CFLAGS       = $(OUR_CFLAGS)
-AM_CPPFLAGS     = $(OUR_CPPFLAGS)
-AM_LDFLAGS      = $(OUR_LDFLAGS)
+AM_CPPFLAGS = \
+       $(OUR_CPPFLAGS) \
+       -include $(top_builddir)/config.h \
+       -I${top_srcdir}/src/libnetwork
+
+AM_CFLAGS = \
+       $(OUR_CFLAGS) \
+       -fvisibility=hidden \
+       -ffunction-sections \
+       -fdata-sections
+
+AM_LDFLAGS = \
+       $(OUR_LDFLAGS) \
+       -Wl,--gc-sections \
+       -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
@@ -105,7 +118,6 @@ EXTRA_DIST += \
 dist_network_SCRIPTS = \
        src/functions/functions.at \
        src/functions/functions.auth \
-       src/functions/functions.batman-adv \
        src/functions/functions.bonding \
        src/functions/functions.bridge \
        src/functions/functions.cli \
@@ -165,6 +177,8 @@ dist_network_SCRIPTS = \
        src/functions/functions.vpn \
        src/functions/functions.vpn-security-policies \
        src/functions/functions.wireless \
+       src/functions/functions.wireless-mesh \
+       src/functions/functions.wireless-networks \
        src/functions/functions.wpa_supplicant \
        src/functions/functions.zone \
        src/network-radvd-config \
@@ -181,8 +195,7 @@ dist_helpers_SCRIPTS = \
        src/helpers/hostapd-config-helper \
        src/helpers/ipsec-updown \
        src/helpers/pppd-angel \
-       src/helpers/wpa_supplicant \
-       src/helpers/wpa_supplicant-config-helper
+       src/helpers/wpa_supplicant
 
 bin_PROGRAMS = \
        src/inetcalc
@@ -190,6 +203,9 @@ bin_PROGRAMS = \
 src_inetcalc_SOURCES = \
        src/inetcalc.c
 
+src_inetcalc_LDADD = \
+       src/libnetwork.la
+
 dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/dhcp \
        src/hooks/configs/ipv4-static \
@@ -198,12 +214,10 @@ dist_hooks_configs_SCRIPTS = \
        src/hooks/configs/pppoe-server
 
 dist_hooks_ports_SCRIPTS = \
-       src/hooks/ports/batman-adv \
        src/hooks/ports/bonding \
        src/hooks/ports/dummy \
        src/hooks/ports/ethernet \
        src/hooks/ports/vlan \
-       src/hooks/ports/wireless-adhoc \
        src/hooks/ports/wireless-ap \
        src/hooks/ports/wireless-mesh
 
@@ -214,6 +228,43 @@ dist_hooks_zones_SCRIPTS = \
        src/hooks/zones/pppoe \
        src/hooks/zones/wireless
 
+INSTALL_DIRS += \
+       $(configdir) \
+       $(configdir)/ports \
+       $(configdir)/vpn \
+       $(configdir)/vpn/ipsec/connections \
+       $(configdir)/vpn/security-policies \
+       $(configdir)/wireless \
+       $(configdir)/wireless/networks \
+       $(configdir)/zones
+
+# ------------------------------------------------------------------------------
+
+LIBNETWORK_CURRENT=0
+LIBNETWORK_REVISION=0
+LIBNETWORK_AGE=0
+
+pkginclude_HEADERS = \
+       src/libnetwork/network/libnetwork.h
+
+lib_LTLIBRARIES = \
+       src/libnetwork.la
+
+src_libnetwork_la_SOURCES = \
+       src/libnetwork/libnetwork-private.h \
+       src/libnetwork/libnetwork.c
+
+src_libnetwork_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBNETWORK_CURRENT):$(LIBNETWORK_REVISION):$(LIBNETWORK_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libnetwork/libnetwork.sym
+
+src_libnetwork_la_DEPENDENCIES = \
+       src/libnetwork/libnetwork.sym
+
+EXTRA_DIST += \
+       src/libnetwork/libnetwork.sym
+
 # ------------------------------------------------------------------------------
 
 ppp_SCRIPTS = \
@@ -311,11 +362,11 @@ endif
 
 # ------------------------------------------------------------------------------
 
-pkgconfigdata_DATA = \
+pkgconfig_DATA = \
        src/network.pc
 
 CLEANFILES += \
-       $(pkgconfigdata_DATA)
+       $(pkgconfig_DATA)
 
 EXTRA_DIST += \
        src/network.pc.in
@@ -345,12 +396,12 @@ MANPAGES = \
        man/network-dns-server.8 \
        man/network-performance-tuning.8 \
        man/network-port.8 \
-       man/network-port-batman-adv.8 \
-       man/network-port-batman-adv-port.8 \
        man/network-quick-start.8 \
        man/network-route.8 \
        man/network-route-static.8 \
        man/network-settings.8 \
+       man/network-vpn.8 \
+       man/network-vpn-security-policies.8 \
        man/network-zone.8 \
        man/network-zone-6to4-tunnel.8 \
        man/network-zone-bridge.8 \
@@ -439,6 +490,7 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
+       LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
        PATH=$(top_builddir)/src:$(PATH) \
        functions=$(abs_builddir)/src/functions/functions \
        networkdir=$(abs_srcdir)/src/functions \