From 59b5bad79402b81b130e3b4242a74611d1c3be63 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@gnome.org>
Date: Wed, 10 May 2006 03:37:14 +0000
Subject: move to automake 1.9 and several cleanups (Fixes bug #341056). Patch
 from

2006-05-10  Lucas Rocha  <lucasr@gnome.org>

	* .cvsignore, Makefile.am, autogen.sh, configure.in,
	data/Makefile.am, po/.cvsignore, src/Makefile.am: move to
	automake 1.9 and several cleanups (Fixes bug #341056).
	Patch from Christian Persch <chpe@gnome.org>.
---
 src/Makefile.am | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index e3c62d5..192dc3b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,21 +15,31 @@ zenity_SOURCES = \
 	text.c		\
 	progress.c	\
 	tree.c		\
-	notification.c	\
-	eggtrayicon.c	\
 	eggtrayicon.h	\
+	eggtrayicon.c	\
+	notification.c	\
 	about.c		\
 	util.h		\
 	util.c
 
-INCLUDES = \
-	$(ZENITY_CFLAGS)				\
+zenity_CPPFLAGS = \
 	-I$(includedir)					\
-	-DGNOMELOCALEDIR=\""$(zenitylocaledir)"\"	\
-	-DZENITY_DATADIR=\""$(datadir)/zenity"\"
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DZENITY_DATADIR=\""$(pkgdatadir)"\"		\
+	$(AM_CPPFLAGS)
+
+zenity_CFLAGS = \
+	$(ZENITY_CFLAGS)	\
+	$(LIBNOTIFY_CFLAGS)	\
+	$(WARN_CFLAGS)		\
+	$(AM_CFLAGS)
+
+zenity_LDFLAGS = \
+	$(AM_LDFLAGS)
 
 zenity_LDADD = \
 	$(ZENITY_LIBS)		\
+	$(LIBNOTIFY_LIBS)	\
 	$(X_LIBS)
 
 gladedir = $(datadir)/zenity
-- 
cgit v1.2.3-2-g168b