From 5d30fec547e1160a4404e515cacedc6cb254e7b5 Mon Sep 17 00:00:00 2001 From: Michał Łyszczek Date: Mon, 22 May 2017 22:00:37 +0200 Subject: Splitted Makefiles --- Makefile.am | 17 +---------------- configure.ac | 4 ++-- src/Makefile.am | 9 +++++++++ 3 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 src/Makefile.am diff --git a/Makefile.am b/Makefile.am index 68339e1..85bbbed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,17 +1,2 @@ -bin_PROGRAMS = memperf -memperf_SOURCES = src/bench.c \ - src/main.c \ - src/opts.c \ - src/utils.c - -check_PROGRAMS = tests -tests_CFLAGS = -DTESTS -Wno-unused-value -TESTS = $(check_PROGRAMS) -tests_SOURCES = src/bench.c \ - src/opts.c \ - src/utils.c \ - src/tests.c - -LOG_DRIVER = $(top_srcdir)/tap-driver - +SUBDIRS = src man1_MANS = memperf.1 diff --git a/configure.ac b/configure.ac index fc221e4..d488af8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([memperf], [0.1.0]) +AC_INIT([memperf], [0.1.0], [michal.lyszczek@bofc.pl]) AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_HEADERS([config.h]) @@ -6,5 +6,5 @@ AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"]) AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"]) AC_CHECK_FUNCS(clock_gettime) AC_PROG_CC -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..0bc673c --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,9 @@ +bin_PROGRAMS = memperf +memperf_SOURCES = bench.c main.c opts.c utils.c + +check_PROGRAMS = tests +tests_CFLAGS = -DTESTS -Wno-unused-value +tests_SOURCES = bench.c opts.c utils.c tests.c + +TESTS = $(check_PROGRAMS) +LOG_DRIVER = $(top_srcdir)/tap-driver -- cgit v1.2.3-8-gadcc