diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/trackerd/Makefile.am | 24 | ||||
-rw-r--r-- | src/trackerd/tracker-utils.c | 2 | ||||
-rw-r--r-- | src/xdgmime/Makefile.am | 18 | ||||
-rw-r--r-- | src/xdgmime/xdgmime.c (renamed from src/trackerd/xdgmime.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmime.h (renamed from src/trackerd/xdgmime.h) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimealias.c (renamed from src/trackerd/xdgmimealias.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimealias.h (renamed from src/trackerd/xdgmimealias.h) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimecache.c (renamed from src/trackerd/xdgmimecache.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimecache.h (renamed from src/trackerd/xdgmimecache.h) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimeglob.c (renamed from src/trackerd/xdgmimeglob.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimeglob.h (renamed from src/trackerd/xdgmimeglob.h) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimeint.c (renamed from src/trackerd/xdgmimeint.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimeint.h (renamed from src/trackerd/xdgmimeint.h) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimemagic.c (renamed from src/trackerd/xdgmimemagic.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimemagic.h (renamed from src/trackerd/xdgmimemagic.h) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimeparent.c (renamed from src/trackerd/xdgmimeparent.c) | 0 | ||||
-rw-r--r-- | src/xdgmime/xdgmimeparent.h (renamed from src/trackerd/xdgmimeparent.h) | 0 |
20 files changed, 29 insertions, 22 deletions
@@ -1,3 +1,7 @@ +2007-01-24 Patch from Michael Biebl <mbiebl at gmail com> + + * converted xdgmime to private lib + 2007-01-24 Jamie McCracken <jamiemcc at gnome org> * Added magic.h to check_headers in configure.ac diff --git a/configure.ac b/configure.ac index d71ed9b8e..04d247ee6 100644 --- a/configure.ac +++ b/configure.ac @@ -524,6 +524,7 @@ AC_CONFIG_FILES([ src/trackerd/Makefile src/libtracker/Makefile src/tracker-search-tool/Makefile + src/xdgmime/Makefile po/Makefile.in ]) diff --git a/src/Makefile.am b/src/Makefile.am index 2793032fe..8325fc6d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,5 +9,5 @@ sqlite_dir = sqlite3 endif -SUBDIRS = libstemmer $(sqlite_dir) text-filters trackerd libtracker tracker-extract tracker-thumbnailer $(tracker_gui_dir) +SUBDIRS = libstemmer xdgmime $(sqlite_dir) text-filters trackerd libtracker tracker-extract tracker-thumbnailer $(tracker_gui_dir) diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am index 6e878403c..a0d8a5668 100644 --- a/src/trackerd/Makefile.am +++ b/src/trackerd/Makefile.am @@ -43,22 +43,6 @@ db_sources = \ tracker-db-email.c \ tracker-db-email.h -xdgmime_sources = \ - xdgmime.c \ - xdgmime.h \ - xdgmimealias.c \ - xdgmimealias.h \ - xdgmimecache.c \ - xdgmimecache.h \ - xdgmimeglob.c \ - xdgmimeglob.h \ - xdgmimeint.c \ - xdgmimeint.h \ - xdgmimemagic.c \ - xdgmimemagic.h \ - xdgmimeparent.c \ - xdgmimeparent.h - qdbm_sources = \ depot.c \ depot.h \ @@ -78,7 +62,6 @@ test_tracker_indexer_SOURCES = \ test-tracker-indexer.c \ tracker-utils.c \ tracker-utils.h \ - $(xdgmime_sources) \ $(qdbm_sources) test_tracker_indexer_LDADD = \ @@ -86,7 +69,8 @@ test_tracker_indexer_LDADD = \ $(GTHREAD_LIBS) \ -lz \ -lmagic \ - $(top_builddir)/src/libstemmer/libstemmer-private.la + $(top_builddir)/src/libstemmer/libstemmer-private.la \ + $(top_builddir)/src/xdgmime/libxdgmime.la trackerd_SOURCES = \ trackerd.c \ @@ -94,7 +78,6 @@ trackerd_SOURCES = \ $(fam_sources) \ $(qdbm_sources) \ $(db_sources) \ - $(xdgmime_sources) \ tracker-db.c \ tracker-db.h \ tracker-dbus.c \ @@ -141,4 +124,5 @@ trackerd_LDADD = \ $(GTHREAD_LIBS) \ -lz \ -lmagic \ - $(top_builddir)/src/libstemmer/libstemmer-private.la + $(top_builddir)/src/libstemmer/libstemmer-private.la \ + $(top_builddir)/src/xdgmime/libxdgmime.la diff --git a/src/trackerd/tracker-utils.c b/src/trackerd/tracker-utils.c index 0a4de31e5..abf77b501 100644 --- a/src/trackerd/tracker-utils.c +++ b/src/trackerd/tracker-utils.c @@ -33,7 +33,7 @@ #include "tracker-dbus.h" #include "tracker-utils.h" #include "tracker-indexer.h" -#include "xdgmime.h" +#include "../xdgmime/xdgmime.h" diff --git a/src/xdgmime/Makefile.am b/src/xdgmime/Makefile.am new file mode 100644 index 000000000..3b51b3fae --- /dev/null +++ b/src/xdgmime/Makefile.am @@ -0,0 +1,18 @@ + +noinst_LTLIBRARIES = libxdgmime.la + +libxdgmime_la_SOURCES = \ + xdgmime.c \ + xdgmime.h \ + xdgmimealias.c \ + xdgmimealias.h \ + xdgmimecache.c \ + xdgmimecache.h \ + xdgmimeglob.c \ + xdgmimeglob.h \ + xdgmimeint.c \ + xdgmimeint.h \ + xdgmimemagic.c \ + xdgmimemagic.h \ + xdgmimeparent.c \ + xdgmimeparent.h diff --git a/src/trackerd/xdgmime.c b/src/xdgmime/xdgmime.c index 003a3beea..003a3beea 100644 --- a/src/trackerd/xdgmime.c +++ b/src/xdgmime/xdgmime.c diff --git a/src/trackerd/xdgmime.h b/src/xdgmime/xdgmime.h index 1a4bd3419..1a4bd3419 100644 --- a/src/trackerd/xdgmime.h +++ b/src/xdgmime/xdgmime.h diff --git a/src/trackerd/xdgmimealias.c b/src/xdgmime/xdgmimealias.c index 2dd70f1d6..2dd70f1d6 100644 --- a/src/trackerd/xdgmimealias.c +++ b/src/xdgmime/xdgmimealias.c diff --git a/src/trackerd/xdgmimealias.h b/src/xdgmime/xdgmimealias.h index 3df18d660..3df18d660 100644 --- a/src/trackerd/xdgmimealias.h +++ b/src/xdgmime/xdgmimealias.h diff --git a/src/trackerd/xdgmimecache.c b/src/xdgmime/xdgmimecache.c index 56cb83ae4..56cb83ae4 100644 --- a/src/trackerd/xdgmimecache.c +++ b/src/xdgmime/xdgmimecache.c diff --git a/src/trackerd/xdgmimecache.h b/src/xdgmime/xdgmimecache.h index 61793cb70..61793cb70 100644 --- a/src/trackerd/xdgmimecache.h +++ b/src/xdgmime/xdgmimecache.h diff --git a/src/trackerd/xdgmimeglob.c b/src/xdgmime/xdgmimeglob.c index 917314526..917314526 100644 --- a/src/trackerd/xdgmimeglob.c +++ b/src/xdgmime/xdgmimeglob.c diff --git a/src/trackerd/xdgmimeglob.h b/src/xdgmime/xdgmimeglob.h index 25a1f20e5..25a1f20e5 100644 --- a/src/trackerd/xdgmimeglob.h +++ b/src/xdgmime/xdgmimeglob.h diff --git a/src/trackerd/xdgmimeint.c b/src/xdgmime/xdgmimeint.c index 4a0ac4cc3..4a0ac4cc3 100644 --- a/src/trackerd/xdgmimeint.c +++ b/src/xdgmime/xdgmimeint.c diff --git a/src/trackerd/xdgmimeint.h b/src/xdgmime/xdgmimeint.h index 288148719..288148719 100644 --- a/src/trackerd/xdgmimeint.h +++ b/src/xdgmime/xdgmimeint.h diff --git a/src/trackerd/xdgmimemagic.c b/src/xdgmime/xdgmimemagic.c index 2c67a1bee..2c67a1bee 100644 --- a/src/trackerd/xdgmimemagic.c +++ b/src/xdgmime/xdgmimemagic.c diff --git a/src/trackerd/xdgmimemagic.h b/src/xdgmime/xdgmimemagic.h index 16578962b..16578962b 100644 --- a/src/trackerd/xdgmimemagic.h +++ b/src/xdgmime/xdgmimemagic.h diff --git a/src/trackerd/xdgmimeparent.c b/src/xdgmime/xdgmimeparent.c index 511bbacbc..511bbacbc 100644 --- a/src/trackerd/xdgmimeparent.c +++ b/src/xdgmime/xdgmimeparent.c diff --git a/src/trackerd/xdgmimeparent.h b/src/xdgmime/xdgmimeparent.h index da29452cb..da29452cb 100644 --- a/src/trackerd/xdgmimeparent.h +++ b/src/xdgmime/xdgmimeparent.h |