From db0e1c074f250d596d529622e9f0ffafe59bbdd3 Mon Sep 17 00:00:00 2001 From: c9s Date: Tue, 3 Jun 2014 00:47:06 +0800 Subject: [PATCH] SUBDIRS sequences --- Makefile.am | 3 ++- tests/Makefile.am | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index b7ff7d7..0d9861b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=3rdparty src tests +SUBDIRS=3rdparty src . tests lib_LTLIBRARIES = libr3.la libr3_la_SOURCES = @@ -8,6 +8,7 @@ libr3_la_LDFLAGS = AM_CFLAGS=$(DEPS_CFLAGS) $(GVC_DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/3rdparty -Wall -std=c99 AM_LDFLAGS=$(DEPS_LIBS) $(GVC_DEPS_LIBS) + ACLOCAL_AMFLAGS=-I m4 if ENABLE_DEBUG diff --git a/tests/Makefile.am b/tests/Makefile.am index 35a5d9e..cda7987 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,9 +43,8 @@ endif check_PROGRAMS = $(TESTS) -noinst_PROGRAMS = benchmark - -benchmark_SOURCES = bench.c +noinst_PROGRAMS = bench +bench_SOURCES = bench.c # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include