diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-08 12:57:03 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-08 12:57:03 -0800 |
| commit | 073d8e090f62b509d33021a6ec2cae95f539db55 (patch) | |
| tree | d552a1192560b20039be7c24f7fa54d31fa3d2dc /src | |
| parent | 1e8678642d984fc205fd803fffe915417802139f (diff) | |
| parent | ee9367b059e7bb9e56cad35d54d2e79847dae151 (diff) | |
| download | marco-073d8e090f62b509d33021a6ec2cae95f539db55.tar.bz2 marco-073d8e090f62b509d33021a6ec2cae95f539db55.tar.xz | |
Merge pull request #65 from infirit/1.6
cherry-pick from master and small cleanups/fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/tools/Makefile.am | 2 | ||||
| -rw-r--r-- | src/wm-tester/Makefile.am | 4 |
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@ |