From 9af54690041aaa0a4934c336709bdf42a57afe28 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Sat, 21 Apr 2012 10:34:43 +0200 Subject: [PATCH] tests: Convert tests/Makefile to use automake --- Makefile.am | 2 +- configure.in | 1 + tests/Makefile | 33 --------------------------------- tests/Makefile.am | 31 +++++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 tests/Makefile create mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am index e21060f..c4617c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = include lib doc man python +SUBDIRS = include lib doc man python tests pkgconfig_DATA = libnl-3.0.pc \ libnl-route-3.0.pc \ diff --git a/configure.in b/configure.in index b6060c7..9d99db2 100644 --- a/configure.in +++ b/configure.in @@ -84,6 +84,7 @@ lib/Makefile include/Makefile src/Makefile src/lib/Makefile +tests/Makefile man/Makefile python/Makefile python/setup.py diff --git a/tests/Makefile b/tests/Makefile deleted file mode 100644 index d072ddb..0000000 --- a/tests/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# -# src/Makefile -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation version 2.1 -# of the License. -# -# Copyright (c) 2003-2006 Thomas Graf -# - -ifeq ($(shell [ ! -r ../Makefile.opts ] && echo 1),) - include ../Makefile.opts -endif - -LDFLAGS += -L../lib -lnl -lnl-genl -lnl-route -CIN := $(wildcard test-*.c) -TESTS := $(CIN:%.c=%) - -all: $(TESTS) - -test-%: test-%.c - @echo " LD $@"; \ - $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) - -clean: - @echo " CLEAN src"; \ - rm -f $(TESTS) - -distclean: clean - -install: - @true diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..4193818 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,31 @@ +# -*- Makefile -*- + +AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\" + +LDADD = \ + ${top_builddir}/src/lib/libnl-cli-3.la \ + ${top_builddir}/lib/libnl-3.la \ + ${top_builddir}/lib/libnl-nf-3.la \ + ${top_builddir}/lib/libnl-genl-3.la \ + ${top_builddir}/lib/libnl-route-3.la + +check_PROGRAMS = \ + test-cache-mngr \ + test-create-bond \ + test-create-vlan \ + test-delete-link \ + test-genl \ + test-nf-cache-mngr \ + test-socket-creation + +# Eventually add these to TESTS once converted to be real +# test programs +# TESTS = $(check_PROGRAMS) + +test_cache_mngr_SOURCES = test-cache-mngr.c +test_create_bond_SOURCES = test-create-bond.c +test_create_vlan_SOURCES = test-create-vlan.c +test_delete_link_SOURCES = test-delete-link.c +test_genl_SOURCES = test-genl.c +test_nf_cache_mngr_SOURCES = test-nf-cache-mngr.c +test_socket_creation_SOURCES = test-socket-creation.c