Fix build with automake-1.13 and modernize .am files.
authorKamil Rytarowski <krytarowski@gmail.com>
Thu, 3 Jan 2013 22:07:00 +0000 (3 23:07 +0100)
committerCarlos R. Mafra <crmafra@gmail.com>
Thu, 3 Jan 2013 23:27:31 +0000 (3 23:27 +0000)
The following macro: AM_CONFIG_HEADER is deprecated and replaced with AC_CONFIG_HEADERS. INCLUDES is an old version of AM_CPPLAGS.

12 files changed:
WINGs/Examples/Makefile.am
WINGs/Extras/Makefile.am
WINGs/Makefile.am
WINGs/Tests/Makefile.am
WPrefs.app/Makefile.am
configure.ac
src/Makefile.am
test/Makefile.am
util/Makefile.am
wmlib/Makefile.am
wrlib/Makefile.am
wrlib/tests/Makefile.am

index 924d378..98836c0 100644 (file)
@@ -25,5 +25,5 @@ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
 server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
 
 
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
        -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
index f1dc17f..14b1271 100644 (file)
@@ -20,7 +20,7 @@ libExtraWINGs_la_SOURCES =    \
        wtableview.h \
        wtabledelegates.h 
 
-INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
+AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
        -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 
 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
index 8792ae6..d28aff9 100644 (file)
@@ -86,10 +86,10 @@ libWUtil_la_SOURCES =       \
        wutil.c
 
 
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\"
 AM_CFLAGS =
 
-INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
+        -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
        @XFTFLAGS@ @HEADER_SEARCH_PATH@
 
 pkgconfigdir = $(libdir)/pkgconfig
index 2609171..de6070e 100644 (file)
@@ -16,5 +16,5 @@ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
 
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
        -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
index 3f66428..7929f4a 100644 (file)
@@ -40,10 +40,10 @@ WPrefs_SOURCES = \
        editmenu.h \
        xmodifier.c
 
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\"
 AM_CFLAGS =
 
-INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
+        -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
index c55a5c5..c32b391 100644 (file)
@@ -14,7 +14,7 @@ dnl
 AC_INIT(WindowMaker, 0.95.3, , WindowMaker, http://www.windowmaker.org/)
 AC_CONFIG_SRCDIR(src/WindowMaker.h)
 AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
 AH_BOTTOM([#include "config-paths.h"])
index fbedb98..9c77bb4 100644 (file)
@@ -104,10 +104,10 @@ wmaker_SOURCES =  \
 
 EXTRA_wmaker_SOURCES = osdep_bsd.c osdep_darwin.c osdep_linux.c osdep_stub.c
 
-AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"
 AM_CFLAGS =
 
-INCLUDES = \
+AM_CPPFLAGS = \
+       $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" \
        -I$(top_srcdir)/wrlib \
        -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
index 2f80174..b89a697 100644 (file)
@@ -10,4 +10,4 @@ wtest_SOURCES = wtest.c
 
 wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
 
-INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
+AM_CPPFLAGS = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
index 43fd988..d177818 100644 (file)
@@ -11,9 +11,8 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
 
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
 
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
-
-INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" \
+        $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
        @HEADER_SEARCH_PATH@ \
        -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
 
@@ -82,4 +81,4 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
                        $(srcdir)/wmaker.inst.in >wmaker.inst
 
        chmod 755 wmaker.inst
-       
+
index 4d7c521..3a5ff27 100644 (file)
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libWMaker.la
 
 include_HEADERS = WMaker.h
 
-INCLUDES = $(DFLAGS) @XCFLAGS@
+AM_CPPFLAGS = $(DFLAGS) @XCFLAGS@
 
 libWMaker_la_SOURCES =         \
        menu.c          \
index b191158..0aa8db2 100644 (file)
@@ -46,7 +46,7 @@ libwraster_la_SOURCES =       \
 LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//`
 COMPILE2=`echo $(COMPILE) | sed -e s/-fomit-frame-pointer//`
 
-INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@
+AM_CPPFLAGS = $(DFLAGS) @HEADER_SEARCH_PATH@
 
 libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ @LIBXMU@ -lm
 
index ceec40a..e447e97 100644 (file)
@@ -6,7 +6,7 @@ noinst_PROGRAMS = testdraw testgrad testrot view
 
 EXTRA_DIST = test.png tile.xpm ballot_box.xpm 
 
-INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
+AM_CPPFLAGS = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
 
 LIBLIST = $(top_builddir)/wrlib/libwraster.la