[nautilus] [eel] reorganize Makefile.am



commit ad5e896e1ce04485a115ee684a695b42ea0378a5
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Aug 21 19:03:10 2010 +0200

    [eel] reorganize Makefile.am

 eel/Makefile.am |   54 ++++++++++++++++++++++++++----------------------------
 1 files changed, 26 insertions(+), 28 deletions(-)
---
diff --git a/eel/Makefile.am b/eel/Makefile.am
index 156f2ca..e492c3d 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -5,15 +5,13 @@ noinst_LTLIBRARIES=libeel-2.la
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Eel\"				\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
 	$(CORE_CFLAGS)					\
 	$(WARNING_CFLAGS)				\
+	$(DISABLE_DEPRECATED_CFLAGS)			\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DSOURCE_DATADIR=\""$(top_srcdir)/data"\"	\
 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
-	-DG_DISABLE_DEPRECATED				\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
-	-DGMENU_I_KNOW_THIS_IS_UNSTABLE			\
 	$(NULL)
 
 BUILT_SOURCES = \
@@ -31,29 +29,6 @@ libeel_2_la_LIBADD = 				\
 	$(X_LIBS)				\
 	$(NULL)
 
-libeel_2_la_SOURCES =				\
-	eel-accessibility.c			\
-	eel-art-extensions.c			\
-	eel-background.c			\
-	eel-canvas.c				\
-	eel-canvas-util.c			\
-	eel-canvas-rect-ellipse.c		\
-	eel-debug.c				\
-	eel-editable-label.c			\
-	eel-gdk-extensions.c			\
-	eel-gdk-pixbuf-extensions.c		\
-	eel-glib-extensions.c			\
-	eel-gnome-extensions.c			\
-	eel-graphic-effects.c			\
-	eel-gtk-extensions.c			\
-	eel-lib-self-check-functions.c		\
-	eel-self-checks.c			\
-	eel-stock-dialogs.c			\
-	eel-string.c				\
-	eel-vfs-extensions.c			\
-	eel-lib-self-check-functions.h		\
-	$(NULL)
-
 eel_headers =					\
 	eel-accessibility.h			\
 	eel-art-extensions.h			\
@@ -77,6 +52,30 @@ eel_headers =					\
 	eel.h					\
 	$(NULL)
 
+libeel_2_la_SOURCES =				\
+	eel-accessibility.c			\
+	eel-art-extensions.c			\
+	eel-background.c			\
+	eel-canvas.c				\
+	eel-canvas-util.c			\
+	eel-canvas-rect-ellipse.c		\
+	eel-debug.c				\
+	eel-editable-label.c			\
+	eel-gdk-extensions.c			\
+	eel-gdk-pixbuf-extensions.c		\
+	eel-glib-extensions.c			\
+	eel-gnome-extensions.c			\
+	eel-graphic-effects.c			\
+	eel-gtk-extensions.c			\
+	eel-lib-self-check-functions.c		\
+	eel-self-checks.c			\
+	eel-stock-dialogs.c			\
+	eel-string.c				\
+	eel-vfs-extensions.c			\
+	eel-lib-self-check-functions.h		\
+	$(eel_headers)				\
+	$(NULL)
+
 nodist_libeel_2_la_SOURCES =			\
 	$(BUILT_SOURCES)			\
 	$(NULL)
@@ -109,7 +108,6 @@ check_program_LDFLAGS =	$(check_program_DEPENDENCIES) -lm
 TESTS = check-eel
 
 EXTRA_DIST =					\
-	$(eel_headers)				\
 	check-eel				\
 	eel-marshal.list			\
 	$(NULL)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]