[librsvg] Move rsvg-dimensions and test-performance into tools/.



commit 53fffcdffa381a13ad23e9ef14be4f08af63583d
Author: Hiroyuki Ikezoe <hiikezoe gnome org>
Date:   Sun Apr 18 16:36:50 2010 +0900

    Move rsvg-dimensions and test-performance into tools/.

 Makefile.am                                    |   15 +----------
 configure.in                                   |    1 +
 tools/Makefile.am                              |   33 ++++++++++++++++++++++++
 rsvg-dimensions.c => tools/rsvg-dimensions.c   |    0
 test-performance.c => tools/test-performance.c |    0
 5 files changed, 35 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c562c32..ce4f42f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,13 +4,10 @@ else
 target_rsvg_view =
 endif
 
-SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests doc
+SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests tools doc
 
 lib_LTLIBRARIES = librsvg-2.la
 bin_PROGRAMS = rsvg-convert $(target_rsvg_view)
-if BUILD_MISC_TOOLS
-noinst_PROGRAMS = test-performance rsvg-dimensions
-endif
 
 man_MANS = rsvg.1
 
@@ -106,16 +103,6 @@ rsvg_convert_LDFLAGS =
 rsvg_convert_DEPENDENCIES = $(DEPS)
 rsvg_convert_LDADD = $(LDADDS) $(libm)
 
-test_performance_SOURCES=test-performance.c
-test_performance_LDFLAGS =
-test_performance_DEPENDENCIES = $(DEPS)
-test_performance_LDADD = $(LDADDS) $(libm)
-
-rsvg_dimensions_SOURCES=rsvg-dimensions.c
-rsvg_dimensions_LDFLAGS =
-rsvg_dimensions_DEPENDENCIES = $(DEPS)
-rsvg_dimensions_LDADD = $(LDADDS) $(libm)
-
 rsvg_view_SOURCES = 		\
 	test-display.c
 rsvg_view_LDFLAGS =
diff --git a/configure.in b/configure.in
index a1b547a..c0be88f 100644
--- a/configure.in
+++ b/configure.in
@@ -337,6 +337,7 @@ gtk-engine/examples/bubble/gtk-2.0/Makefile
 gdk-pixbuf-loader/Makefile
 tests/Makefile
 tests/pdiff/Makefile
+tools/Makefile
 doc/Makefile
 ])
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..bf09712
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,33 @@
+if BUILD_MISC_TOOLS
+noinst_PROGRAMS = test-performance rsvg-dimensions
+endif
+
+INCLUDES =				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir) 		\
+	$(LIBGSF_CFLAGS)		\
+	$(LIBCROCO_CFLAGS)		\
+	$(LIBRSVG_CFLAGS) 		\
+	$(GTK_CFLAGS)			\
+	$(GDK_X11_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"librsvg\" 	\
+	-DLIBRSVG_DATADIR="\"$(datadir)\""
+
+DEPS = $(top_builddir)/librsvg-2.la
+LDADDS =				\
+	$(LIBGSF_LIBS)			\
+	$(GLIB_LIBS)			\
+	$(LIBCROCO_LIBS)		\
+	$(LIBRSVG_LIBS) 		\
+	$(top_builddir)/librsvg-2.la
+
+test_performance_SOURCES = test-performance.c
+test_performance_LDFLAGS =
+test_performance_DEPENDENCIES = $(DEPS)
+test_performance_LDADD = $(LDADDS) $(libm)
+
+rsvg_dimensions_SOURCES = rsvg-dimensions.c
+rsvg_dimensions_LDFLAGS =
+rsvg_dimensions_DEPENDENCIES = $(DEPS)
+rsvg_dimensions_LDADD = $(LDADDS) $(libm)
+
diff --git a/rsvg-dimensions.c b/tools/rsvg-dimensions.c
similarity index 100%
rename from rsvg-dimensions.c
rename to tools/rsvg-dimensions.c
diff --git a/test-performance.c b/tools/test-performance.c
similarity index 100%
rename from test-performance.c
rename to tools/test-performance.c



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