build-sys: correct all Makefile.am files for LOCALEDIR, etc

Some of the latest changes to Makefile.am files are missing.

This patch restores the LOCALEDIR variable, among others,
and dispenses with the include directives in the ps/ and top/
subdirectories since they're no longer needed.
This commit is contained in:
Jim Warner authored and Craig Small committed 2012-01-04 08:58:54 +11:00
1 parent e64b6f70d7
commit 3388f65c03
4 files changed
+16 -6

No files matched your search

+4 -1
View File
@@ -1,4 +1,7 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I$(top_srcdir)/include \
-DLOCALEDIR=\"$(localedir)\"
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
+4 -1
View File
@@ -1,5 +1,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I$(top_srcdir)/include \
-DLOCALEDIR=\"$(localedir)\"
LIBprocps_CURRENT=0
LIBprocps_REVISION=0
+4 -2
View File
@@ -1,6 +1,8 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I$(top_srcdir)/include \
-DLOCALEDIR=\"$(localedir)\"
AM_CFLAGS = -I../proc -I../include
AM_LDFLAGS = ../proc/libprocps.la
dist_man_MANS = ps.1
+4 -2
View File
@@ -1,6 +1,8 @@
AM_CPPFLAGS = -include $(top_builddir)/config.h
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I$(top_srcdir)/include \
-DLOCALEDIR=\"$(localedir)\"
AM_CFLAGS = -I../proc -I../include
AM_LDFLAGS = ../proc/libprocps.la
if WITH_NCURSES