X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=81dbe02eb13b17d22e7a1fc7581a6f1f5424ccc9;hb=3d99aecedf9d6e6ebeadcedbee081049b03dbbf8;hp=21f2e535d16a4aae2728dbc1dfd9ed50adb83cf6;hpb=6507d6070b6d5b3e1aabde4c32a76f86046e5046;p=pazpar2-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 21f2e53..81dbe02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,13 @@
-# $Id: Makefile.am,v 1.21 2007-05-15 08:56:03 adam Exp $
+# This file is part of Pazpar2.
+
+sbin_PROGRAMS = pazpar2
 
-bin_PROGRAMS = pazpar2
 check_PROGRAMS = test_config \
-      test_icu_I18N \
       test_record \
-      test_reclists \
-      test_relevance \
-      test_sel_thread
-
-check_SCRIPTS = test_http.sh
-
-EXTRA_DIST = test_http.xml test_http.cfg $(check_SCRIPTS)
+      test_sel_thread \
+      test_normalize
 
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+TESTS = $(check_PROGRAMS)
 
 noinst_LIBRARIES = libpazpar2.a
 
@@ -20,11 +15,10 @@ 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 \
+AM_CFLAGS = $(YAZINC)
+        
+libpazpar2_a_SOURCES = pazpar2_config.c pazpar2_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 \
 	record.h record.c reclists.c reclists.h \
 	relevance.c relevance.h termlists.c termlists.h \
@@ -32,10 +26,11 @@ libpazpar2_a_SOURCES = config.c config.h eventl.c eventl.h \
 	util.c util.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 \
+	dirent.c direntz.h
 
 pazpar2_SOURCES = pazpar2.c
-pazpar2_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
+pazpar2_LDADD = libpazpar2.a $(YAZLIB)
 
 test_config_SOURCES = test_config.c
 test_config_LDADD = libpazpar2.a $(YAZLIB)
@@ -43,15 +38,9 @@ test_config_LDADD = libpazpar2.a $(YAZLIB)
 test_record_SOURCES = test_record.c
 test_record_LDADD = libpazpar2.a $(YAZLIB)
 
-test_reclists_SOURCES = test_reclists.c
-test_reclists_LDADD = libpazpar2.a $(YAZLIB)
-
-test_relevance_SOURCES = test_relevance.c
-test_relevance_LDADD = libpazpar2.a $(YAZLIB)
-
 test_sel_thread_SOURCES = test_sel_thread.c
 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)