X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=recctrl%2FMakefile.am;h=042e41e176824160fd9aa2dacb4f5490db4497a5;hb=e075935572b3ef0a246aaefde50efadbfa12e5c4;hp=6bc40927eece5ea5873b819411c039062152bf44;hpb=e92856ea4fecc1a5ea6875ad47797d462fd5fcae;p=idzebra-moved-to-github.git

diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am
index 6bc4092..042e41e 100644
--- a/recctrl/Makefile.am
+++ b/recctrl/Makefile.am
@@ -1,4 +1,8 @@
-## $Id: Makefile.am,v 1.22 2006-06-26 15:11:39 marc Exp $
+## $Id: Makefile.am,v 1.25 2006-06-29 09:10:42 adam Exp $
+
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+modlibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)/modules
 
 common_libs = libidzebra-recctrl.la \
  ../data1/libidzebra-data1.la \
@@ -8,58 +12,40 @@ common_libs = libidzebra-recctrl.la \
 
 # The shared modules 
 mod_grs_regx_la_SOURCES = regxread.c
-mod_grs_regx_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
+mod_grs_regx_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_regx_la_LADD = $(TCL_LIB)
 mod_grs_regx_la_LIBADD = $(common_libs) $(mod_grs_regx_la_LADD)
 
 mod_grs_xml_la_SOURCES = xmlread.c
-mod_grs_xml_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
+mod_grs_xml_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_xml_la_LADD = $(EXPAT_LIBS)
 mod_grs_xml_la_LIBADD = $(common_libs) $(mod_grs_xml_la_LADD)
 
 mod_grs_marc_la_SOURCES = marcread.c marcomp.c marcomp.h inline.c inline.h
-mod_grs_marc_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
+mod_grs_marc_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_marc_la_LADD =
 mod_grs_marc_la_LIBADD = $(common_libs) $(mod_grs_marc_la_LADD)
 
-#mod_grs_csv_la_SOURCES = csvread.c
-#mod_grs_csv_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
-#mod_grs_csv_la_LADD =
-#mod_grs_csv_la_LIBADD = $(common_libs) $(mod_grs_csv_la_LADD)
-
-#mod_grs_danbib_la_SOURCES = danbibr.c
-#mod_grs_danbib_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
-#mod_grs_danbib_la_LADD =
-#mod_grs_danbib_la_LIBADD = $(common_libs) $(mod_grs_danbib_la_LADD)
-
 mod_safari_la_SOURCES = safari.c
-mod_safari_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
+mod_safari_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_safari_la_LADD =
 mod_safari_la_LIBADD = $(common_libs) $(mod_safari_la_LADD)
 
 mod_alvis_la_SOURCES = alvis.c
-mod_alvis_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
+mod_alvis_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_alvis_la_LADD = $(XSLT_LIBS)
 mod_alvis_la_LIBADD = $(common_libs) $(mod_alvis_la_LADD)
 
-#mod_xslt_la_SOURCES = xslt.c
-#mod_xslt_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
-#mod_xslt_la_LADD = $(XSLT_LIBS)
-#mod_xslt_la_LIBADD = $(common_libs) $(mod_alvis_la_LADD)
-
-pkglib_LTLIBRARIES = $(SHARED_MODULE_LA) 
+modlib_LTLIBRARIES = $(SHARED_MODULE_LA) 
 EXTRA_LTLIBRARIES = \
 	mod-grs-regx.la \
 	mod-grs-xml.la \
 	mod-grs-marc.la  \
 	mod-safari.la \
 	mod-alvis.la
-#	mod-grs-csv.la  \
-#	mod-grs-danbib.la 
-#	mod-xslt.la
 
 # The common library
-lib_LTLIBRARIES = libidzebra-recctrl.la
+zebralib_LTLIBRARIES = libidzebra-recctrl.la
 libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c 
 libidzebra_recctrl_la_LDFLAGS = -export-dynamic -version-info $(ZEBRALIBS_VERSION)
 libidzebra_recctrl_la_LIBADD = $(STATIC_MODULE_OBJ) \
@@ -76,9 +62,5 @@ EXTRA_libidzebra_recctrl_la_SOURCES = \
  $(mod_grs_marc_la_SOURCES) \
  $(mod_safari_la_SOURCES) \
  $(mod_alvis_la_SOURCES)
-# $(mod_grs_csv_la_SOURCES) \
-# $(mod_grs_danbib_la_SOURCES) \
-# $(mod_xslt_la_SOURCES)
 
-AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(XSLT_CFLAGS) \
- $(TCL_INCLUDE) 
+AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(XSLT_CFLAGS) $(TCL_INCLUDE)