From d82757d2335eb1301f9aef511ca8f64e2762a0bd Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 13 Oct 2012 11:34:31 +0400 Subject: [PATCH] Ticket #2917: Makefile.ams cleanup: remove unused AM_CPPFLAGS. Signed-off-by: Andrew Borodin --- lib/event/Makefile.am | 4 ---- lib/filehighlight/Makefile.am | 4 ---- lib/mcconfig/Makefile.am | 3 --- lib/search/Makefile.am | 4 ---- lib/skin/Makefile.am | 4 ---- lib/tty/Makefile.am | 4 ---- lib/widget/Makefile.am | 4 ---- src/diffviewer/Makefile.am | 4 ---- src/filemanager/Makefile.am | 4 ---- src/viewer/Makefile.am | 4 ---- 10 files changed, 39 deletions(-) diff --git a/lib/event/Makefile.am b/lib/event/Makefile.am index bd1f8a0dd..472c6502c 100644 --- a/lib/event/Makefile.am +++ b/lib/event/Makefile.am @@ -7,8 +7,4 @@ libmcevent_la_SOURCES = \ manage.c \ raise.c -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) diff --git a/lib/filehighlight/Makefile.am b/lib/filehighlight/Makefile.am index 99f1299ea..c0d5eea28 100644 --- a/lib/filehighlight/Makefile.am +++ b/lib/filehighlight/Makefile.am @@ -6,8 +6,4 @@ libmcfilehighlight_la_SOURCES = \ ini-file-read.c \ internal.h -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) diff --git a/lib/mcconfig/Makefile.am b/lib/mcconfig/Makefile.am index a504ff9cf..2b581378d 100644 --- a/lib/mcconfig/Makefile.am +++ b/lib/mcconfig/Makefile.am @@ -7,7 +7,4 @@ libmcconfig_la_SOURCES = \ set.c \ paths.c -AM_CPPFLAGS = \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) diff --git a/lib/search/Makefile.am b/lib/search/Makefile.am index 05e469b54..f4aedd0af 100644 --- a/lib/search/Makefile.am +++ b/lib/search/Makefile.am @@ -9,8 +9,4 @@ libsearch_la_SOURCES = \ glob.c \ hex.c -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) diff --git a/lib/skin/Makefile.am b/lib/skin/Makefile.am index 6eba29824..c742c29c0 100644 --- a/lib/skin/Makefile.am +++ b/lib/skin/Makefile.am @@ -9,8 +9,4 @@ libmcskin_la_SOURCES = \ lines.c \ internal.h -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) diff --git a/lib/tty/Makefile.am b/lib/tty/Makefile.am index 300d4e295..0b7c11f86 100644 --- a/lib/tty/Makefile.am +++ b/lib/tty/Makefile.am @@ -22,10 +22,6 @@ TTY_SRC = \ libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC) -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) if HAVE_GMODULE diff --git a/lib/widget/Makefile.am b/lib/widget/Makefile.am index 748294f05..c14b5f292 100644 --- a/lib/widget/Makefile.am +++ b/lib/widget/Makefile.am @@ -22,8 +22,4 @@ libmcwidget_la_SOURCES = \ widget-common.c widget-common.h \ wtools.c wtools.h -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) diff --git a/src/diffviewer/Makefile.am b/src/diffviewer/Makefile.am index bbe2bb862..3df15d1bc 100644 --- a/src/diffviewer/Makefile.am +++ b/src/diffviewer/Makefile.am @@ -5,10 +5,6 @@ libdiffviewer_la_SOURCES = \ search.c \ ydiff.c ydiff.h -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) libdiffviewer_la_LIBADD = ../../lib/libmc.la diff --git a/src/filemanager/Makefile.am b/src/filemanager/Makefile.am index dd6ef02e8..eb81781fb 100644 --- a/src/filemanager/Makefile.am +++ b/src/filemanager/Makefile.am @@ -31,10 +31,6 @@ libmcfilemanager_la_SOURCES = \ libmcfilemanager_la_SOURCES += mountlist.c mountlist.h #endif -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) libmcfilemanager_la_LIBADD = ../../lib/libmc.la diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am index cab509257..9f9add0a4 100644 --- a/src/viewer/Makefile.am +++ b/src/viewer/Makefile.am @@ -19,10 +19,6 @@ libmcviewer_la_SOURCES = \ plain.c \ search.c -AM_CPPFLAGS = \ - -DDATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" - AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS) libmcviewer_la_LIBADD = ../../lib/libmc.la