diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2013-07-25 10:05:20 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2013-07-25 10:05:20 +0200 |
| commit | b5d8e8e26c0116e4b6e556a0f6da8777bc55c590 (patch) | |
| tree | 6547fcc371b14b1fbc5499fc1afc8a98faa1e77b | |
| parent | e5eb27494cd237e60645db4d7be5b4acf41cb5e0 (diff) | |
| parent | f4fe56973a29265e22f049ceed1e299573f90ec4 (diff) | |
| download | mtdev-git-b5d8e8e26c0116e4b6e556a0f6da8777bc55c590.tar.gz | |
Merge build fixes from Peter Hutterer.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index c175641..50f8ffe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = src test pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = mtdev.pc -INCLUDES = $(top_srcdir)/include/ +AM_CPPFLAGS = $(top_srcdir)/include/ .PHONY: ChangeLog INSTALL INSTALL: diff --git a/configure.ac b/configure.ac index 211f1c5..070b861 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,6 @@ AC_CONFIG_AUX_DIR([config-aux]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE LIB_VERSION=1:0:0 AC_SUBST([LIB_VERSION]) diff --git a/src/Makefile.am b/src/Makefile.am index 16d388c..317e237 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ libmtdev_la_SOURCES = \ AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI -INCLUDES = -I$(top_srcdir)/include/ +AM_CPPFLAGS = -I$(top_srcdir)/include/ libmtdevincludedir = $(includedir) libmtdevinclude_HEADERS = \ diff --git a/test/Makefile.am b/test/Makefile.am index 0cdd859..2b504bd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel bin_PROGRAMS = mtdev-test -INCLUDES=-I$(top_srcdir)/include/ +AM_CPPFLAGS=-I$(top_srcdir)/include/ mtdev_mapgen_SOURCES = mtdev-mapgen.c |