blob: 3cfd5eb440187d5367991a9261ce03739c75ce0a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
diff -Naur sword.orig/configure.ac sword.new/configure.ac
--- sword.orig/configure.ac 2013-01-13 12:46:13.000000000 +0100
+++ sword.new/configure.ac 2013-01-13 12:47:34.000000000 +0100
@@ -13,7 +13,7 @@
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADERS(include/config.h)
AC_CONFIG_MACRO_DIR([m4])
diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am
--- sword.orig/examples/cmdline/Makefile.am 2013-01-13 12:46:13.000000000 +0100
+++ sword.new/examples/cmdline/Makefile.am 2013-01-13 12:53:55.000000000 +0100
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
endif
LDADD = $(top_builddir)/lib/libsword.la
diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am
--- sword.orig/tests/Makefile.am 2013-01-13 12:46:14.000000000 +0100
+++ sword.new/tests/Makefile.am 2013-01-13 12:54:33.000000000 +0100
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
endif
LDADD = $(top_builddir)/lib/libsword.la
diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am
--- sword.orig/utilities/Makefile.am 2013-01-13 12:46:13.000000000 +0100
+++ sword.new/utilities/Makefile.am 2013-01-13 12:56:12.000000000 +0100
@@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS = 1.6
SUBDIRS = diatheke
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
endif
LDADD = $(top_builddir)/lib/libsword.la
noinst_PROGRAMS = cipherraw lexdump \
|
