Modernize autoconf/automake init

ianw · ianw · commit 37ae7047247d · 2018-09-12T21:51:11.000+10:00
diff --git a/configure.in b/configure.in
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
-AC_INIT(libiptcdata/iptc-data.h)
+AC_INIT(libiptcdata, 1.0.4)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libiptcdata, 1.0.4)
+AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------
diff --git a/iptc/Makefile.am b/iptc/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = po
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/libiptcdata			\
 	-DIPTC_LOCALEDIR=\""$(datadir)/locale"\"
diff --git a/libiptcdata/Makefile.am b/libiptcdata/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =              				\
+AM_CPPFLAGS =              				\
 	-DLIBIPTCDATA_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir)/libiptcdata			\
 	-I$(top_srcdir)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-INCLUDES = \`
	`1`	`+AM_CPPFLAGS = \`
`2`	`2`	`-DLIBIPTCDATA_LOCALEDIR=\""$(datadir)/locale"\" \`
`3`	`3`	`-I$(top_srcdir)/libiptcdata \`
`4`	`4`	`-I$(top_srcdir)`