diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-22 08:18:51 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-22 08:18:51 -0700 |
| commit | 2dc7552e5959f75524dd54e37d9e5518f50ff689 (patch) | |
| tree | 095aae1fd214c8b5520bbc6c62dd7be1c3666fbc /src | |
| parent | 6f064dfd7f52202df314d31edefcca1826e2324b (diff) | |
| parent | 6db62a08b3b1b3af4d125fe01cf0263ed548ed3d (diff) | |
| download | mate-notification-daemon-2dc7552e5959f75524dd54e37d9e5518f50ff689.tar.bz2 mate-notification-daemon-2dc7552e5959f75524dd54e37d9e5518f50ff689.tar.xz | |
Merge pull request #23 from infirit/1.6
Cherrypick usefull commits from master
Diffstat (limited to 'src')
| -rw-r--r-- | src/capplet/Makefile.am | 2 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/themes/standard/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/capplet/Makefile.am b/src/capplet/Makefile.am index 3a15e6d..dfd31f2 100644 --- a/src/capplet/Makefile.am +++ b/src/capplet/Makefile.am @@ -14,7 +14,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) man_MANS = mate-notification-properties.1 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/daemon \ $(NOTIFICATION_CAPPLET_CFLAGS) \ diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 4f9471c..ce476e5 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -18,7 +18,7 @@ notificationdaemon-dbus-glue.h: notificationdaemon.xml dbus-binding-tool --mode=glib-server --prefix=notification_daemon \ $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(NOTIFICATION_DAEMON_CFLAGS) \ -DENGINES_DIR=\"$(libdir)/mate-notification-daemon/engines\" diff --git a/src/themes/standard/Makefile.am b/src/themes/standard/Makefile.am index d5b4a2a..c31098c 100644 --- a/src/themes/standard/Makefile.am +++ b/src/themes/standard/Makefile.am @@ -6,6 +6,6 @@ libstandard_la_SOURCES = theme.c libstandard_la_LDFLAGS = -module -avoid-version -no-undefined libstandard_la_LIBADD = $(NOTIFICATION_DAEMON_LIBS) -INCLUDES = $(NOTIFICATION_DAEMON_CFLAGS) +AM_CPPFLAGS = $(NOTIFICATION_DAEMON_CFLAGS) -include $(top_srcdir)/git.mk |