Remove making of library: now just linking nesessary object files

[ftsbench.git] / Makefile

diff --git a/Makefile b/Makefile
index c9a1c8a..b6639c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,13 @@
 topbuilddir=.
 
 PROGRAM=ftsbench stopfilter
+PROGRAMOBJ_ftsbench = rand.o finnegan.o utils.o
 
 WITH_PGSQL=yes
 WITH_MYSQL=yes
 
-SUBDIRS=
-LIBRARY=ftsbench.a
-LIBOBJ=rand.o finnegan.o utils.o 
-
 ifeq ($(WITH_PGSQL), yes)
-LIBOBJ+=pgdriver.o
+PROGRAMOBJ_ftsbench+=pgdriver.o
 PGSQLCFG=/usr/local/pgsql/bin/pg_config
 EXTRALIB+=-L`$(PGSQLCFG) --libdir` -lpq -L/usr/lib -lcrypt
 EXTRAINCLUDE+=-I`$(PGSQLCFG) --includedir`
@@ -18,7 +15,7 @@ EXTRAFLAGS+=-DWITH_PGSQL
 endif
 
 ifeq ($(WITH_MYSQL), yes)
-LIBOBJ+=mysqldriver.o
+PROGRAMOBJ_ftsbench+=mysqldriver.o
 MYSQLCFG=/usr/local/mysql/bin/mysql_config
 EXTRALIB+=`$(MYSQLCFG) --libs_r` 
 EXTRAINCLUDE+=`$(MYSQLCFG) --cflags`