summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-11-14 03:46:02 -0800
committerStefano Karapetsas <[email protected]>2013-11-14 03:46:02 -0800
commitcf101a024b8749a1b2109e3a3b49a7a760124d2d (patch)
treea212f4011007f122cfbefc817f469a82902b7a16 /src
parent58048178cefe6627278bb21d15889685ecd7c8f8 (diff)
parent89e368b69cdcce2eb643012921e499ba078ac4b9 (diff)
downloadmarco-cf101a024b8749a1b2109e3a3b49a7a760124d2d.tar.bz2
marco-cf101a024b8749a1b2109e3a3b49a7a760124d2d.tar.xz
Merge pull request #66 from infirit/master
Remove unneeded files plus various cleanup/fixes
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/tools/Makefile.am2
-rw-r--r--src/wm-tester/Makefile.am4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a7b01237..031d59bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmarco-private.la
SUBDIRS=wm-tester tools themes
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(srcdir)/include \
-DMARCO_LIBEXECDIR=\"$(libexecdir)\" \
-DHOST_ALIAS=\"@HOST_ALIAS@\" \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 031ef961..39df3390 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -3,7 +3,7 @@
icondir=$(pkgdatadir)/icons
icon_DATA=marco-window-demo.png
-INCLUDES=@MARCO_WINDOW_DEMO_CFLAGS@ @MARCO_MESSAGE_CFLAGS@ \
+AM_CPPFLAGS=@MARCO_WINDOW_DEMO_CFLAGS@ @MARCO_MESSAGE_CFLAGS@ \
-DMARCO_ICON_DIR=\"$(pkgdatadir)/icons\" \
-DMARCO_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index 3d35c741..e719bdb6 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES=@MARCO_CFLAGS@
+AM_CPPFLAGS=@MARCO_CFLAGS@
wm_tester_SOURCES= \
main.c
@@ -22,4 +22,4 @@ wm_tester_LDADD= @MARCO_LIBS@
test_gravity_LDADD= @MARCO_LIBS@
test_resizing_LDADD= @MARCO_LIBS@
test_size_hints_LDADD= @MARCO_LIBS@
-focus_window_LDADD= @MARCO_LIBS@ \ No newline at end of file
+focus_window_LDADD= @MARCO_LIBS@