[totem] Clean up lib/Makefile.am

[Philip Withnall <pwithnall src gnome org>]

commit 1d8ca5aef82699a170ab8a2a65a285c402235db0
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 14:18:57 2010 +0100

    Clean up lib/Makefile.am

 lib/Makefile.am |   35 +++++++++++------------------------
 1 files changed, 11 insertions(+), 24 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8d223ed..2de0d94 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,32 +1,19 @@
-noinst_LTLIBRARIES =					\
-	libtotemscrsaver.la
+noinst_LTLIBRARIES = libtotemscrsaver.la
 
-common_defines = \
-	-D_REENTRANT					\
-	-DDBUS_API_SUBJECT_TO_CHANGE			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\"			\
-	-DLIBEXECDIR=\""$(libexecdir)"\"		\
-	-DBINDIR=\""$(bindir)"\"			\
-	-DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\"	\
-	$(DISABLE_DEPRECATED)
-
-libtotemscrsaver_la_SOURCES =				\
-	totem-scrsaver.c				\
+libtotemscrsaver_la_SOURCES = \
+	totem-scrsaver.c	\
 	totem-scrsaver.h
 
-libtotemscrsaver_la_CFLAGS =				\
-	$(common_defines)				\
-	$(DEPENDENCY_CFLAGS)				\
-	$(WARN_CFLAGS)					\
-	$(DBUS_CFLAGS)					\
-	$(AM_CFLAGS)
+libtotemscrsaver_la_CPPFLAGS = $(DISABLE_DEPRECATED)
 
-libtotemscrsaver_la_LDFLAGS =				\
-	$(AM_LDFLAGS)
+libtotemscrsaver_la_CFLAGS = \
+	$(DEPENDENCY_CFLAGS)	\
+	$(WARN_CFLAGS)		\
+	$(DBUS_CFLAGS)
 
-libtotemscrsaver_la_LIBADD =				\
-	$(DBUS_LIBS)					\
+libtotemscrsaver_la_LIBADD = \
+	$(DEPENDENCY_LIBS)	\
+	$(DBUS_LIBS)		\
 	$(XTEST_LIBS)
 
 -include $(top_srcdir)/git.mk