X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=54292be390a725b0893622e215dcd00f5d5420c3;hb=419a9b497318d051f7b1dd6b1d123a7ee31a7ee0;hp=72077813c092473ef875d206132f7950f3a7fa96;hpb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;p=pazpar2-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 7207781..54292be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,7 @@
 
 sbin_PROGRAMS = pazpar2
 
-noinst_PROGRAMS = icu_chain_test
-
-check_PROGRAMS = test_config \
-      test_icu_I18N \
-      test_record \
-      test_reclists \
-      test_relevance \
+check_PROGRAMS = \
       test_sel_thread \
       test_normalize
 
@@ -20,44 +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_icu_I18N_SOURCES = test_icu_I18N.c
-test_icu_I18N_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
+test_sel_thread_LDADD = libpazpar2.a $(YAZLIB)
 
 test_normalize_SOURCES = test_normalize.c
-test_normalize_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
+test_normalize_LDADD = libpazpar2.a $(YAZLIB)