X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=54292be390a725b0893622e215dcd00f5d5420c3;hb=b7c5f432169f9b532ad006c369e28631cdf3c8ce;hp=28f57885e655d12303bae5896c45113dac8ec677;hpb=9b94aba38a8853bb76733c4a37736a4a40856f92;p=pazpar2-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 28f5788..54292be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,10 @@
-# $Id: Makefile.am,v 1.25 2007-05-23 11:19:31 marc Exp $
+# This file is part of Pazpar2.
 
-bin_PROGRAMS = pazpar2 icu_chain_test
+sbin_PROGRAMS = pazpar2
 
-check_PROGRAMS = test_config \
-      test_icu_I18N \
-      test_record \
-      test_reclists \
-      test_relevance \
-      test_sel_thread
+check_PROGRAMS = \
+      test_sel_thread \
+      test_normalize
 
 TESTS = $(check_PROGRAMS)
 
@@ -17,41 +14,29 @@ MAINTAINERCLEANFILES = Makefile.in cconfig.h
 
 CONFIG_CLEAN_FILES=*.log
 
-AM_CFLAGS = $(YAZINC) $(ICU_CPPFLAGS)
-
-libpazpar2_a_SOURCES = config.c config.h eventl.c eventl.h \
-	http.c http_command.c http_command.h http.h \
-        icu_I18N.h icu_I18N.c \
-	logic.c pazpar2.h \
+AM_CFLAGS = $(YAZINC)
+        
+libpazpar2_a_SOURCES = pazpar2_config.c pazpar2_config.h eventl.c eventl.h \
+	http.c http_command.c http.h \
+	session.c session.h \
 	record.h record.c reclists.c reclists.h \
 	relevance.c relevance.h termlists.c termlists.h \
         normalize7bit.h normalize7bit.c \
-	util.c util.h zeerex.c zeerex.h database.c database.h \
+	zeerex.c zeerex.h database.c database.h \
 	settings.h settings.c sel_thread.c sel_thread.h getaddrinfo.c \
 	charsets.c charsets.h \
-	client.c client.h connection.c connection.h host.h parameters.h
+	client.c client.h connection.c connection.h host.h parameters.h \
+	marcmap.c marcmap.h marchash.c marchash.h \
+	jenkins_hash.c jenkins_hash.h normalize_record.c normalize_record.h \
+	normalize_cache.c normalize_cache.h incref.c incref.h \
+	ppmutex.c ppmutex.h
 
 pazpar2_SOURCES = pazpar2.c
-pazpar2_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
-
-icu_chain_test_SOURCES = icu_chain_test.c icu_I18N.c
-icu_chain_test_LDADD = $(YAZLIB) $(ICU_LIBS)
-
-test_config_SOURCES = test_config.c
-test_config_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
-
-test_record_SOURCES = test_record.c
-test_record_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
-
-test_reclists_SOURCES = test_reclists.c
-test_reclists_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
-
-test_relevance_SOURCES = test_relevance.c
-test_relevance_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
+pazpar2_LDADD = libpazpar2.a $(YAZLIB)
 
 test_sel_thread_SOURCES = test_sel_thread.c
-test_sel_thread_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
+test_sel_thread_LDADD = libpazpar2.a $(YAZLIB)
 
-test_icu_I18N_SOURCES = test_icu_I18N.c
-test_icu_I18N_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
+test_normalize_SOURCES = test_normalize.c
+test_normalize_LDADD = libpazpar2.a $(YAZLIB)