X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=58e6a9e765f0ac845de80e9a22be8ccfa6dfa190;hb=5bfd1cd672117b1217e960c3181a11975ebf0f6a;hp=8cb5d5972296e952cd1de31f7f5183d3345ced6c;hpb=f5f8ae5e9f5609cd8a779579f5e6148a55ae8c73;p=chise%2Fconcord.git

diff --git a/Makefile.in b/Makefile.in
index 8cb5d59..58e6a9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,8 @@
 CC = @CC@
 DEFS = @DEFS@
 LIBS = @LIBS@
-CFLAGS	= -I. @CFLAGS@ -c -Wall -Wmissing-prototypes
+CFLAGS	= -I. @CFLAGS@ -c -Wall -Wmissing-prototypes $(DEFS)
+LDFLAGS = @LDFLAGS@
 
 LIBTOOL = @LIBTOOL@
 
@@ -25,7 +26,7 @@ libdir	= @libdir@
 
 #libexecdir = @libexecdir@
 
-#localstatedir = @localstatedir@
+localstatedir = @localstatedir@
 
 sharedstatedir = @sharedstatedir@
 
@@ -37,31 +38,56 @@ top_builddir = @builddir@
 INCLUDE_INSTALLDIR = ${prefix}/include
 LIB_INSTALLDIR	= ${libdir}
 
-VERSION		= @PACKAGE_VERSION@
-ABI_VERSION     = 0:0:0
+CONCORD_DB_PREFIX = ${localstatedir}/concord
+CONCORD_DB_FORMAT_VERSION = 1.0
+CONCORD_DB_DIR	= ${CONCORD_DB_PREFIX}/${CONCORD_DB_FORMAT_VERSION}
+CONCORD_SI_DB_DIR = ${CONCORD_DB_DIR}/db
+
+CONCORD_CFLAGS	= \
+	-DCONCORD_DB_FORMAT_VERSION=\"${CONCORD_DB_FORMAT_VERSION}/\" \
+	-DCONCORD_DB_DIR=\"${CONCORD_DB_DIR}/\" \
+	-DCONCORD_SI_DB_DIR=\"${CONCORD_SI_DB_DIR}/\"
 
+VERSION		= @PACKAGE_VERSION@
+ABI_VERSION     = 2:0:1
 
-HEADERS	= concord.h concord-name.h concord-bdb.h
-OBJS	= concord.lo concord-bdb.lo name.lo
 
+HEADERS	= cos.h concord.h concord-name.h concord-bdb.h
+OBJS	= cos.lo symbol.lo read.lo print.lo concord.lo concord-bdb.lo \
+		name.lo cos-hash.lo
 
 all:	libconcord.la
 
 libconcord.la:	$(OBJS)
 	$(LIBTOOL) --mode=link \
-		$(CC) -o libconcord.la $(OBJS) $(LIBS) \
+		$(CC) $(LDFLAGS) -o libconcord.la $(OBJS) $(LIBS) \
 		-rpath ${libdir} -version-info $(ABI_VERSION) \
 		-no-undefined
 
-concord.lo:	concord.c concord.h config.h sysdep.h
+cos.lo:	cos.c cos-i.h cos-hash.h cos-read.h cos.h concord.h config.h sysdep.h Makefile
+	$(LIBTOOL) --mode=compile $(CC) $(CONCORD_CFLAGS) $(CFLAGS) cos.c
+
+symbol.lo:	symbol.c cos-i.h cos-hash.h cos.h config.h sysdep.h Makefile
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) symbol.c
+
+read.lo:	read.c cos-read.h Makefile
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) read.c
+
+print.lo:	print.c cos-print.h Makefile
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) print.c
+
+concord.lo:	concord.c cos-i.h cos-hash.h cos.h concord.h config.h sysdep.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) concord.c
 
 concord-bdb.lo:	concord-bdb.c concord-bdb.h concord-name.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) concord-bdb.c
 
-name.lo:	name.c concord-name.h
+name.lo:	name.c concord-name.h hash-i.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) name.c
 
+cos-hash.lo:	cos-hash.c concord-name.h cos-hash.h hash-i.h
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) cos-hash.c
+
 
 install:	install.h install.libs
 
@@ -77,6 +103,12 @@ install.libs:	libconcord.la
 sample:	sample.c libconcord.la
 	gcc -Wall -Wmissing-prototypes -o sample sample.c -lconcord
 
+symbol-test:	symbol-test.c libconcord.la
+	gcc -Wall -Wmissing-prototypes -o symbol-test symbol-test.c -lconcord
+
+hash-test:	hash-test.c libconcord.la
+	gcc -Wall -Wmissing-prototypes -o hash-test hash-test.c -lconcord
+
 
 clean:
 	-$(RM) -r *.o *.lo *.so *.la .libs sample