Hello! I am attaching the patch.
Regards,
>From 41fdd2455a9cff40c2d499c31ae7cbf96c20a839 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski <[email protected]> Date: Thu, 3 Jan 2013 23:07:00 +0100 Subject: [PATCH] Fix build with automake-1.13 and modernize .am files. The following macro: AM_CONFIG_HEADER is deprecated and replaced with AC_CONFIG_HEADERS. INCLUDES is an old version of AM_CPPLAGS. --- WINGs/Examples/Makefile.am | 2 +- WINGs/Extras/Makefile.am | 2 +- WINGs/Makefile.am | 4 ++-- WINGs/Tests/Makefile.am | 2 +- WPrefs.app/Makefile.am | 4 ++-- configure.ac | 2 +- src/Makefile.am | 4 ++-- test/Makefile.am | 2 +- util/Makefile.am | 7 +++---- wmlib/Makefile.am | 2 +- wrlib/Makefile.am | 2 +- wrlib/tests/Makefile.am | 2 +- 12 files changed, 17 insertions(+), 18 deletions(-) diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am index 924d378..98836c0 100644 --- a/WINGs/Examples/Makefile.am +++ b/WINGs/Examples/Makefile.am @@ -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@ diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am index f1dc17f..14b1271 100644 --- a/WINGs/Extras/Makefile.am +++ b/WINGs/Extras/Makefile.am @@ -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 \ diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 8792ae6..d28aff9 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -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 diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am index 2609171..de6070e 100644 --- a/WINGs/Tests/Makefile.am +++ b/WINGs/Tests/Makefile.am @@ -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@ diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 3f66428..7929f4a 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index c55a5c5..c32b391 100644 --- a/configure.ac +++ b/configure.ac @@ -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"]) diff --git a/src/Makefile.am b/src/Makefile.am index fbedb98..9c77bb4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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@ diff --git a/test/Makefile.am b/test/Makefile.am index 2f80174..b89a697 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -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 diff --git a/util/Makefile.am b/util/Makefile.am index 43fd988..d177818 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -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 - + diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am index 4d7c521..3a5ff27 100644 --- a/wmlib/Makefile.am +++ b/wmlib/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libWMaker.la include_HEADERS = WMaker.h -INCLUDES = $(DFLAGS) @XCFLAGS@ +AM_CPPFLAGS = $(DFLAGS) @XCFLAGS@ libWMaker_la_SOURCES = \ menu.c \ diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index b191158..0aa8db2 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -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 diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am index ceec40a..e447e97 100644 --- a/wrlib/tests/Makefile.am +++ b/wrlib/tests/Makefile.am @@ -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 -- 1.8.1
