GNOME.org
 

tracker r2197 - in branches/indexer-split: . src/libinotify src/libstemmer src/libstemmer/include src/libstemmer/libstemmer src/libstemmer/runtime src/libstemmer/src_c src/libtracker-common src/libtracker-db

Author: mr
Date: Fri Sep  5 10:13:49 2008
New Revision: 2197
URL: http://svn.gnome.org/viewvc/tracker?rev=2197&view=rev

Log:
	* src/libstemmer/*: Moved all source files into this directory,
	there is no need to have them all in separate directories. Make
	the library generated a shared library.

	* src/libtracker-common/Makefile.am:
	* src/libtracker-db/Makefile.am: Made libtracker-common and
	libtracker-db shared libraries.

	* src/libtracker-common/tracker-language.c: Fixed include paths.


Added:
   branches/indexer-split/src/libstemmer/api.c
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/runtime/api.c
   branches/indexer-split/src/libstemmer/api.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/runtime/api.h
   branches/indexer-split/src/libstemmer/header.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/runtime/header.h
   branches/indexer-split/src/libstemmer/libstemmer.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/libstemmer/libstemmer.c
   branches/indexer-split/src/libstemmer/libstemmer.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/include/libstemmer.h
   branches/indexer-split/src/libstemmer/modules.h
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/libstemmer/modules.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_danish.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_danish.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_danish.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_dutch.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_dutch.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_english.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_english.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_english.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_english.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_finnish.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_finnish.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_french.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_french.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_french.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_french.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_german.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_german.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_german.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_german.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_hungarian.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_hungarian.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_italian.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_italian.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_italian.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_norwegian.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_norwegian.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_porter.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_porter.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_porter.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_portuguese.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_portuguese.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_russian.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_russian.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_russian.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_spanish.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_spanish.h
   branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c
      - copied, changed from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_swedish.c
   branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.h
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_swedish.h
   branches/indexer-split/src/libstemmer/utilities.c
      - copied unchanged from r2192, /branches/indexer-split/src/libstemmer/runtime/utilities.c
Removed:
   branches/indexer-split/src/libstemmer/include/
   branches/indexer-split/src/libstemmer/libstemmer/
   branches/indexer-split/src/libstemmer/runtime/
   branches/indexer-split/src/libstemmer/src_c/
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libinotify/Makefile.am
   branches/indexer-split/src/libstemmer/Makefile.am
   branches/indexer-split/src/libtracker-common/Makefile.am
   branches/indexer-split/src/libtracker-common/tracker-language.c
   branches/indexer-split/src/libtracker-db/Makefile.am

Modified: branches/indexer-split/src/libinotify/Makefile.am
==============================================================================
--- branches/indexer-split/src/libinotify/Makefile.am	(original)
+++ branches/indexer-split/src/libinotify/Makefile.am	Fri Sep  5 10:13:49 2008
@@ -5,15 +5,15 @@
 
 noinst_LTLIBRARIES = libinotify.la
 
-libinotify_la_SOURCES = 		\
-	inotify-monitor.c 		\
-	inotify-handle.c 		\
-	inotify-listhash.c 		\
-	inotify-monitor.h		\
-	inotify-handle.h 		\
-	inotify-listhash.h 		\
-	inotify-log.h 			\
-	linux-inotify-syscalls.h	\
+libinotify_la_SOURCES = 				\
+	inotify-monitor.c 				\
+	inotify-handle.c 				\
+	inotify-listhash.c 				\
+	inotify-monitor.h				\
+	inotify-handle.h 				\
+	inotify-listhash.h 				\
+	inotify-log.h 					\
+	linux-inotify-syscalls.h			\
 	libinotify.h
 
 libinotify_la_LDFLAGS = -version-info 0:0:0

Modified: branches/indexer-split/src/libstemmer/Makefile.am
==============================================================================
--- branches/indexer-split/src/libstemmer/Makefile.am	(original)
+++ branches/indexer-split/src/libstemmer/Makefile.am	Fri Sep  5 10:13:49 2008
@@ -1,39 +1,49 @@
-noinst_LTLIBRARIES = libstemmer.la
+INCLUDES =						\
+	-DSHAREDIR=\""$(datadir)"\"			\
+	-DG_LOG_DOMAIN=\"Tracker\"			\
+	-I$(top_srcdir)/src
 
-libstemmer_la_SOURCES = 			\
-	libstemmer/libstemmer.c 		\
-	runtime/api.c 				\
-	runtime/utilities.c 			\
-	src_c/stem_UTF_8_danish.c 		\
-	src_c/stem_UTF_8_dutch.c 		\
-	src_c/stem_UTF_8_english.c 		\
-	src_c/stem_UTF_8_finnish.c 		\
-	src_c/stem_UTF_8_french.c 		\
-	src_c/stem_UTF_8_german.c 		\
-	src_c/stem_UTF_8_hungarian.c 		\
-	src_c/stem_UTF_8_italian.c 		\
-	src_c/stem_UTF_8_norwegian.c 		\
-	src_c/stem_UTF_8_porter.c 		\
-	src_c/stem_UTF_8_portuguese.c 		\
-	src_c/stem_UTF_8_russian.c 		\
-	src_c/stem_UTF_8_spanish.c 		\
-	src_c/stem_UTF_8_swedish.c 		\
-	include/libstemmer.h 			\
-	libstemmer/modules.h 			\
-	runtime/api.h 				\
-	runtime/header.h 			\
-	src_c/stem_UTF_8_danish.h 		\
-	src_c/stem_UTF_8_dutch.h 		\
-	src_c/stem_UTF_8_english.h 		\
-	src_c/stem_UTF_8_finnish.h 		\
-	src_c/stem_UTF_8_french.h 		\
-	src_c/stem_UTF_8_german.h 		\
-	src_c/stem_UTF_8_hungarian.h 		\
-	src_c/stem_UTF_8_italian.h 		\
-	src_c/stem_UTF_8_norwegian.h 		\
-	src_c/stem_UTF_8_porter.h 		\
-	src_c/stem_UTF_8_portuguese.h 		\
-	src_c/stem_UTF_8_russian.h 		\
-	src_c/stem_UTF_8_spanish.h 		\
-	src_c/stem_UTF_8_swedish.h
+libstemmerdir = $(libdir)/tracker
+libstemmer_LTLIBRARIES = libstemmer.la
+
+libstemmer_la_SOURCES = 		\
+	libstemmer.c 			\
+	api.c 				\
+	utilities.c 			\
+	stem_UTF_8_danish.c 		\
+	stem_UTF_8_dutch.c 		\
+	stem_UTF_8_english.c 		\
+	stem_UTF_8_finnish.c 		\
+	stem_UTF_8_french.c 		\
+	stem_UTF_8_german.c 		\
+	stem_UTF_8_hungarian.c 		\
+	stem_UTF_8_italian.c 		\
+	stem_UTF_8_norwegian.c 		\
+	stem_UTF_8_porter.c 		\
+	stem_UTF_8_portuguese.c 	\
+	stem_UTF_8_russian.c 		\
+	stem_UTF_8_spanish.c 		\
+	stem_UTF_8_swedish.c
+
+noinst_HEADERS =			\
+	api.h				\
+	header.h			\
+	libstemmer.h			\
+	modules.h			\
+	stem_UTF_8_danish.h		\
+	stem_UTF_8_dutch.h		\
+	stem_UTF_8_english.h		\
+	stem_UTF_8_finnish.h		\
+	stem_UTF_8_french.h		\
+	stem_UTF_8_german.h		\
+	stem_UTF_8_hungarian.h		\
+	stem_UTF_8_italian.h		\
+	stem_UTF_8_norwegian.h		\
+	stem_UTF_8_porter.h		\
+	stem_UTF_8_portuguese.h		\
+	stem_UTF_8_russian.h		\
+	stem_UTF_8_spanish.h		\
+	stem_UTF_8_swedish.h
+
+libstemmer_la_LDFLAGS = -version-info 0:0:0
 

Copied: branches/indexer-split/src/libstemmer/libstemmer.c (from r2192, /branches/indexer-split/src/libstemmer/libstemmer/libstemmer.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/libstemmer/libstemmer.c	(original)
+++ branches/indexer-split/src/libstemmer/libstemmer.c	Fri Sep  5 10:13:49 2008
@@ -14,8 +14,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../include/libstemmer.h"
-#include "../runtime/api.h"
+
+#include "libstemmer.h"
+#include "api.h"
 #include "modules.h"
 
 struct sb_stemmer {

Copied: branches/indexer-split/src/libstemmer/modules.h (from r2192, /branches/indexer-split/src/libstemmer/libstemmer/modules.h)
==============================================================================
--- /branches/indexer-split/src/libstemmer/libstemmer/modules.h	(original)
+++ branches/indexer-split/src/libstemmer/modules.h	Fri Sep  5 10:13:49 2008
@@ -21,19 +21,19 @@
  * german, italian, norwegian, porter, portuguese, russian, spanish, swedish
  */
 
-#include "../src_c/stem_UTF_8_danish.h"
-#include "../src_c/stem_UTF_8_dutch.h"
-#include "../src_c/stem_UTF_8_english.h"
-#include "../src_c/stem_UTF_8_finnish.h"
-#include "../src_c/stem_UTF_8_french.h"
-#include "../src_c/stem_UTF_8_german.h"
-#include "../src_c/stem_UTF_8_italian.h"
-#include "../src_c/stem_UTF_8_norwegian.h"
-#include "../src_c/stem_UTF_8_porter.h"
-#include "../src_c/stem_UTF_8_portuguese.h"
-#include "../src_c/stem_UTF_8_russian.h"
-#include "../src_c/stem_UTF_8_spanish.h"
-#include "../src_c/stem_UTF_8_swedish.h"
+#include "stem_UTF_8_danish.h"
+#include "stem_UTF_8_dutch.h"
+#include "stem_UTF_8_english.h"
+#include "stem_UTF_8_finnish.h"
+#include "stem_UTF_8_french.h"
+#include "stem_UTF_8_german.h"
+#include "stem_UTF_8_italian.h"
+#include "stem_UTF_8_norwegian.h"
+#include "stem_UTF_8_porter.h"
+#include "stem_UTF_8_portuguese.h"
+#include "stem_UTF_8_russian.h"
+#include "stem_UTF_8_spanish.h"
+#include "stem_UTF_8_swedish.h"
 
 typedef enum {
   ENC_UNKNOWN,

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_danish.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_danish.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_danish.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int danish_UTF_8_stem(struct SN_env * z);
 static int r_undouble(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_dutch.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_dutch.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_dutch.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int dutch_UTF_8_stem(struct SN_env * z);
 static int r_standard_suffix(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_english.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_english.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_english.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_english.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int english_UTF_8_stem(struct SN_env * z);
 static int r_exception2(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_finnish.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_finnish.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_finnish.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int finnish_UTF_8_stem(struct SN_env * z);
 static int r_tidy(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_french.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_french.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_french.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_french.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int french_UTF_8_stem(struct SN_env * z);
 static int r_un_accent(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_german.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_german.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_german.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_german.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int german_UTF_8_stem(struct SN_env * z);
 static int r_standard_suffix(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_hungarian.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_hungarian.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_hungarian.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int hungarian_UTF_8_stem(struct SN_env * z);
 

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_italian.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_italian.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_italian.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int italian_UTF_8_stem(struct SN_env * z);
 static int r_vowel_suffix(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_norwegian.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_norwegian.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_norwegian.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int norwegian_UTF_8_stem(struct SN_env * z);
 static int r_other_suffix(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_porter.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_porter.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_porter.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int porter_UTF_8_stem(struct SN_env * z);
 static int r_Step_5b(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_portuguese.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_portuguese.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_portuguese.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int portuguese_UTF_8_stem(struct SN_env * z);
 static int r_residual_form(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_russian.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_russian.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_russian.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int russian_UTF_8_stem(struct SN_env * z);
 static int r_tidy_up(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_spanish.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_spanish.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_spanish.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int spanish_UTF_8_stem(struct SN_env * z);
 static int r_residual_suffix(struct SN_env * z);

Copied: branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c (from r2192, /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_swedish.c)
==============================================================================
--- /branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_swedish.c	(original)
+++ branches/indexer-split/src/libstemmer/stem_UTF_8_swedish.c	Fri Sep  5 10:13:49 2008
@@ -14,7 +14,7 @@
 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-#include "../runtime/header.h"
+#include "header.h"
 
 extern int swedish_UTF_8_stem(struct SN_env * z);
 static int r_other_suffix(struct SN_env * z);

Modified: branches/indexer-split/src/libtracker-common/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-common/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker-common/Makefile.am	Fri Sep  5 10:13:49 2008
@@ -9,7 +9,8 @@
 	$(GIO_CFLAGS)					\
 	$(GLIB2_CFLAGS)
 
-noinst_LTLIBRARIES = libtracker-common.la
+libtracker_commondir = $(libdir)/tracker
+libtracker_common_LTLIBRARIES = libtracker-common.la
 
 if OS_WIN32
 os_sources = tracker-os-dependant-win.c
@@ -19,45 +20,49 @@
 
 if HAVE_HAL
 hal_sources = 						\
-	tracker-hal.c					\
+	tracker-hal.c
+hal_headers = 						\
 	tracker-hal.h
 endif
 
 libtracker_common_la_SOURCES =	 			\
 	$(os_sources)					\
 	$(hal_sources)					\
-	tracker-configuration.c 			\
-	tracker-configuration.h 			\
 	tracker-config.c 				\
-	tracker-config.h				\
+	tracker-configuration.c 			\
 	tracker-dbus.c	 				\
-	tracker-dbus.h					\
 	tracker-field.c					\
-	tracker-field.h					\
 	tracker-field-data.c				\
-	tracker-field-data.h				\
 	tracker-file-utils.c				\
-	tracker-file-utils.h				\
 	tracker-ioprio.c				\
-	tracker-ioprio.h				\
 	tracker-language.c				\
-	tracker-language.h				\
 	tracker-log.c	 				\
-	tracker-log.h					\
 	tracker-module-config.c				\
-	tracker-module-config.h				\
 	tracker-nfs-lock.c				\
-	tracker-nfs-lock.h				\
 	tracker-ontology.c				\
+	tracker-parser.c				\
+	tracker-service.c				\
+	tracker-type-utils.c				\
+	tracker-utils.c
+
+noinst_HEADERS =					\
+	$(hal_headers)					\
+	tracker-config.h				\
+	tracker-configuration.h				\
+	tracker-dbus.h					\
+	tracker-field-data.h				\
+	tracker-field.h					\
+	tracker-file-utils.h				\
+	tracker-ioprio.h				\
+	tracker-language.h				\
+	tracker-log.h					\
+	tracker-module-config.h				\
+	tracker-nfs-lock.h				\
 	tracker-ontology.h				\
 	tracker-os-dependant.h				\
-	tracker-parser.c				\
 	tracker-parser.h				\
-	tracker-service.c				\
 	tracker-service.h				\
-	tracker-type-utils.c				\
 	tracker-type-utils.h				\
-	tracker-utils.c					\
 	tracker-utils.h
 
 libtracker_common_la_LDFLAGS = -version-info 0:0:0

Modified: branches/indexer-split/src/libtracker-common/tracker-language.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-language.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-language.c	Fri Sep  5 10:13:49 2008
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <libstemmer/include/libstemmer.h>
+#include <libstemmer/libstemmer.h>
 
 #include "tracker-log.h" 
 #include "tracker-language.h"

Modified: branches/indexer-split/src/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-db/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker-db/Makefile.am	Fri Sep  5 10:13:49 2008
@@ -7,27 +7,30 @@
 	$(DBUS_CFLAGS)							\
 	$(GLIB2_CFLAGS)
 
-noinst_LTLIBRARIES = libtracker-db.la
+libtracker_dbdir = $(libdir)/tracker
+libtracker_db_LTLIBRARIES = libtracker-db.la
 
 libtracker_db_la_SOURCES = 						\
 	tracker-db-action.c						\
-	tracker-db-action.h						\
 	tracker-db-dbus.c						\
-	tracker-db-dbus.h						\
 	tracker-db-file-info.c						\
-	tracker-db-file-info.h						\
 	tracker-db-index.c						\
-	tracker-db-index.h						\
 	tracker-db-index-item.c						\
-	tracker-db-index-item.h						\
 	tracker-db-index-manager.c					\
-	tracker-db-index-manager.h					\
 	tracker-db-interface.c						\
-	tracker-db-interface.h						\
 	tracker-db-interface-sqlite.c					\
+	tracker-db-manager.c
+
+noinst_HEADERS =							\
+	tracker-db-action.h						\
+	tracker-db-dbus.h						\
+	tracker-db-file-info.h						\
+	tracker-db-index.h						\
+	tracker-db-index-item.h						\
+	tracker-db-index-manager.h					\
+	tracker-db-interface.h						\
 	tracker-db-interface-sqlite.h					\
-	tracker-db-manager.c						\
-	tracker-db-manager.h
+	tracker-db-manager.h 
 
 libtracker_db_la_LDFLAGS = -version-info 0:0:0
 libtracker_db_la_LIBADD = 						\
@@ -35,4 +38,4 @@
 	$(SQLITE3_LIBS)							\
 	$(QDBM_LIBS)							\
 	$(DBUS_LIBS)							\
-	$(GLIB2_LIBS)
+	$(GLIB2_LIBS)
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]