tracker r2893 - trunk/src/tracker-extract

[mr svn gnome org]

Author: mr
Date: Fri Feb  6 17:33:02 2009
New Revision: 2893
URL: http://svn.gnome.org/viewvc/tracker?rev=2893&view=rev

Log:
Moved tracker-extract to tracker-main


Added:
   trunk/src/tracker-extract/tracker-main.c   (contents, props changed)
      - copied, changed from r2892, /trunk/src/tracker-extract/tracker-extract.c
   trunk/src/tracker-extract/tracker-main.h   (contents, props changed)
      - copied, changed from r2892, /trunk/src/tracker-extract/tracker-extract.h
Removed:
   trunk/src/tracker-extract/tracker-extract.c
   trunk/src/tracker-extract/tracker-extract.h
Modified:
   trunk/src/tracker-extract/Makefile.am

Modified: trunk/src/tracker-extract/Makefile.am
==============================================================================
--- trunk/src/tracker-extract/Makefile.am	(original)
+++ trunk/src/tracker-extract/Makefile.am	Fri Feb  6 17:33:02 2009
@@ -211,11 +211,26 @@
 libexec_PROGRAMS = tracker-extract
 
 tracker_extract_SOURCES = 						\
+	tracker-dbus.c							\
+	tracker-dbus.h							\
 	tracker-extract.c						\
-	tracker-extract.h
+	tracker-extract.h						\
+	tracker-main.c							\
+	tracker-main.h
 
 tracker_extract_LDADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)
+
+dbus_sources = 								\
+	tracker-extractor-glue.h
+
+%-glue.h: $(top_srcdir)/data/dbus/%.xml
+	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
+
+BUILT_SOURCES = 							\
+	$(dbus_sources)
+
+CLEANFILES = $(BUILT_SOURCES)
\ No newline at end of file

Copied: trunk/src/tracker-extract/tracker-main.c (from r2892, /trunk/src/tracker-extract/tracker-extract.c)
==============================================================================
--- /trunk/src/tracker-extract/tracker-extract.c	(original)
+++ trunk/src/tracker-extract/tracker-main.c	Fri Feb  6 17:33:02 2009
@@ -53,7 +53,7 @@
 #define MAX_MEM_AMD64 512
 
 
-#define DISABLE_DEBUG
+#undef DISABLE_DEBUG
 
 #ifdef G_HAVE_ISO_VARARGS
 #  ifdef DISABLE_DEBUG

Copied: trunk/src/tracker-extract/tracker-main.h (from r2892, /trunk/src/tracker-extract/tracker-extract.h)
==============================================================================
--- /trunk/src/tracker-extract/tracker-extract.h	(original)
+++ trunk/src/tracker-extract/tracker-main.h	Fri Feb  6 17:33:02 2009
@@ -19,10 +19,11 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_EXTRACT_H__
-#define __TRACKER_EXTRACT_H__
+#ifndef __TRACKER_MAIN_H__
+#define __TRACKER_MAIN_H__
 
 #include <glib.h>
+
 #include "tracker-escape.h"
 
 G_BEGIN_DECLS
@@ -51,4 +52,4 @@
 
 G_END_DECLS
 
-#endif /* __TRACKER_EXTRACT_H__ */
+#endif /* __TRACKER_MAIN_H__ */