[gnome-main-menu] Fix makefiles after INCLUDES => AM_CPPFLAGS rename



commit 5ace3e0d3d6bf0bc4df39c29fee773b884ea21bb
Author: Stefano Karapetsas <stefano karapetsas com>
Date:   Sat Jan 25 19:03:34 2014 +0100

    Fix makefiles after INCLUDES => AM_CPPFLAGS rename

 application-browser/src/Makefile.am |    4 +---
 caja-main-menu/Makefile.am          |    4 +---
 main-menu/src/Makefile.am           |   10 ++++------
 3 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/application-browser/src/Makefile.am b/application-browser/src/Makefile.am
index 4aa06bd..a8cc1a4 100644
--- a/application-browser/src/Makefile.am
+++ b/application-browser/src/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS =                                                  \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        $(APPLICATION_BROWSER_CFLAGS)                           \
        $(WARN_CFLAGS)
 
@@ -9,6 +10,3 @@ application_browser_SOURCES =                                  \
 
 application_browser_LDADD =                                    \
        $(APPLICATION_BROWSER_LIBS)
-
-AM_CPPFLAGS =                                                  \
-       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
diff --git a/caja-main-menu/Makefile.am b/caja-main-menu/Makefile.am
index 78b6325..6cd3ee4 100644
--- a/caja-main-menu/Makefile.am
+++ b/caja-main-menu/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS =                                          \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DG_LOG_DOMAIN=\"Caja-Main-Menu\"               \
        -DDATADIR=\"$(datadir)\"                        \
        -I$(top_srcdir)                                 \
@@ -17,6 +18,3 @@ libcaja_main_menu_la_SOURCES = \
 
 libcaja_main_menu_la_LDFLAGS = -module -avoid-version
 libcaja_main_menu_la_LIBADD  = $(CAJA_LIBS)
-
-AM_CPPFLAGS =                                                  \
-       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
diff --git a/main-menu/src/Makefile.am b/main-menu/src/Makefile.am
index 536496d..d225f67 100644
--- a/main-menu/src/Makefile.am
+++ b/main-menu/src/Makefile.am
@@ -1,4 +1,8 @@
 AM_CPPFLAGS =                                                          \
+       -DDATADIR=\""$(datadir)"\"                                      \
+       -DUIDIR=\""$(uidir)"\"                                          \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+       -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        $(MAIN_MENU_CFLAGS)                                             \
        $(NETWORK_CFLAGS)                                               \
        $(WARN_CFLAGS)
@@ -10,12 +14,6 @@ libexec_PROGRAMS = main-menu
 
 bin_PROGRAMS = trigger-panel-run-dialog
 
-AM_CPPFLAGS =                                                          \
-       -DDATADIR=\""$(datadir)"\"                                      \
-       -DUIDIR=\""$(uidir)"\"                                          \
-       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-       -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
 main_menu_SOURCES =                                                    \
        main-menu.c                                                     \
        main-menu-ui.c                  main-menu-ui.h                  \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]