Update pkg-config stuff.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1099 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-06-26 20:19:25 +00:00
parent 086b1181a9
commit dc459b88b4
16 changed files with 161 additions and 244 deletions

View File

@@ -6,7 +6,7 @@ SUBDIRS = ftk flaim sql xflaim
rpms srcrpm:
for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir $@; \
cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@; \
done
dist-hook:

View File

@@ -2,17 +2,19 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = GNUMakefile README.W32 debian netware win32
SUBDIRS = $(subdirs) src util sample docs obs
SUBDIRS = src util sample docs obs
doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libflaim.pc
RPM = rpm
rpms srcrpm: dist
$(MAKE) -C obs $(AM_MAKEFLAGS) $@
rpmarch=`rpm --showrc | grep ^build\ arch | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z $$rpmarch || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)
dist-hook:

View File

@@ -32,14 +32,12 @@ AC_ARG_ENABLE([debug],
# Automake conditionals
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
if test -n "$DOXYGEN"; then
AC_CONFIG_FILES([docs/doxygen/Makefile
docs/doxygen/doxyfile])
fi
#AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/doxygen/doxyfile])])
AS_IF([test -n "$DOXYGEN"], [AC_CONFIG_FILES([docs/doxygen/doxyfile])])
# Check for pthreads
ACX_PTHREAD(
[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
[AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
@@ -61,9 +59,8 @@ AC_CHECK_FUNCS([atexit strchr])
AC_SYS_LARGEFILE
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
AS_IF([test "x$debug" = xyes],
[AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])])
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
@@ -101,8 +98,7 @@ case $host in
fi ;;
*-apple-darwin*)
AC_DEFINE([OSX], [],
[Define if building on Apple OSX.]) ;;
AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;;
*-*-aix*)
if "x$CXX" != "xg++"; then
@@ -119,6 +115,7 @@ esac
AC_CONFIG_FILES([Makefile
docs/Makefile
docs/doxygen/Makefile
obs/flaim.spec
obs/Makefile
sample/Makefile

View File

@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libflaim
Name: FLAIM
URL: http://forge.novell.com/modules/xfmod/project/?flaim
Description: Embeddable cross-platform database engine
Version: @VERSION@
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -lflaim -L${libdir}
Version: @PACKAGE_VERSION@
Requires: libflaimtk >= 1.0
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -L${libdir} -lflaim
Cflags: -I${includedir}

View File

@@ -1,16 +1,30 @@
EXTRA_DIST = ha_flaim.cpp ha_flaim.h rflread.cpp rflread.h viewrfl.cpp
FLAIM_INCLUDE = -I$(top_srcdir)/src
FLAIM_LDADD = ../src/libflaim.la
AM_CPPFLAGS = $(FLAIM_INCLUDE) $(FTK_INCLUDE)
LDADD = libutil.la $(FLAIM_LDADD)
## Utility Convenience Library
noinst_LTLIBRARIES = libutil.la
libutil_la_SOURCES = \
flm_dlst.cpp \
flm_dlst.h \
flm_lutl.cpp \
flm_lutl.h \
sharutil.cpp \
sharutil.h
## Utility Programs
bin_PROGRAMS = flmcheckdb flmrebuild flmview flmdbshell flmgigatest
flmcheckdb_SOURCES = checkdb.cpp
flmcheckdb_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
flmcheckdb_LDADD = libutil.la ../src/libflaim.la
flmrebuild_SOURCES = rebuild.cpp
flmrebuild_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
flmrebuild_LDADD = libutil.la ../src/libflaim.la
flmgigatest_SOURCES = gigatest.cpp gigatest.h
flmview_SOURCES = \
flmarg.h \
@@ -24,33 +38,12 @@ flmview_SOURCES = \
viewlhdr.cpp \
viewmenu.cpp \
viewsrch.cpp
flmview_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
flmview_LDADD = libutil.la ../src/libflaim.la
flmdbshell_SOURCES = \
dbshell.cpp \
dbshell.h \
flm_edit.cpp \
flm_edit.h
flmdbshell_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
flmdbshell_LDADD = libutil.la ../src/libflaim.la
flmgigatest_SOURCES = gigatest.cpp gigatest.h
flmgigatest_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
flmgigatest_LDADD = libutil.la ../src/libflaim.la
## Utility Convenience Library
noinst_LTLIBRARIES = libutil.la
libutil_la_SOURCES = \
flm_dlst.cpp \
flm_dlst.h \
flm_lutl.cpp \
flm_lutl.h \
sharutil.cpp \
sharutil.h
libutil_la_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
## Check Programs
@@ -58,8 +51,6 @@ check_PROGRAMS = ut_basictest
check_HEADERS = flmunittest.h
ut_basictest_SOURCES = basic_test.cpp flmunittest.cpp
ut_basictest_CPPFLAGS = -I$(top_srcdir)/src $(FTK_INCLUDE)
ut_basictest_LDADD = libutil.la ../src/libflaim.la
## Unit Tests
@@ -67,3 +58,4 @@ TESTS = ut_basictest
clean-local:
rm -rf samplebackup samplerestore.*

View File

@@ -2,21 +2,27 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = GNUMakefile README.W32 debian netware win32
SUBDIRS = src util obs
if HAVE_DOXYGEN
SUBDIRS += docs
DOXYDIR = docs
endif
SUBDIRS = src util obs $(DOXYDIR)
doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libflaimtk.pc
RPM = rpm
rpms srcrpm: dist
$(MAKE) -C obs $(AM_MAKEFLAGS) $@
rpmarch=`rpm --showrc | grep ^build\ arch | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z $$rpmarch || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)
dist-hook:
rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

View File

@@ -34,30 +34,30 @@ AC_ARG_ENABLE([openssl],
# Create Automake conditional based on the DOXYGEN variable
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
if test -n "$DOXYGEN"; then
AC_CONFIG_FILES([docs/Makefile
docs/doxyfile])
fi
#AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/doxyfile])])
AS_IF([test -n "$DOXYGEN"], [AC_CONFIG_FILES([docs/doxyfile])])
# Configure for large files, even in 32-bit environments
AC_SYS_LARGEFILE
# Check for pthreads
ACX_PTHREAD(
[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
CC="$PTHREAD_CC"
CXX="$PTHREAD_CXX"])
[AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
CC="$PTHREAD_CC"
CXX="$PTHREAD_CXX"])
# Checks for libraries.
AC_SEARCH_LIBS([initscr], [ncurses])
AC_CHECK_LIB([rt], [aio_suspend])
if test "x$openssl" = xyes; then
AC_DEFINE([FLM_OPENSSL], [], [Define to use openssl])
AC_CHECK_LIB([ssl], [SSL_new])
AC_CHECK_LIB([crypto], [CRYPTO_add])
AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([z], [gzopen])
fi
AS_IF([test "x$openssl" = xyes],
[AC_DEFINE([FLM_OPENSSL], [1], [Define to use openssl])
AC_CHECK_LIB([ssl], [SSL_new])
AC_CHECK_LIB([crypto], [CRYPTO_add])
AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([z], [gzopen])])
# Checks for header files.
AC_HEADER_RESOLV
@@ -81,13 +81,9 @@ AC_FUNC_MALLOC
AC_FUNC_MKTIME
AC_CHECK_FUNCS([atexit fdatasync ftruncate getcwd gethostbyaddr gethostbyname gethostname gethrtime gettimeofday inet_ntoa localtime_r memmove memset mkdir pstat_getdynamic realpath rmdir select socket strchr strrchr strstr])
# Configure for large files, even in 32-bit environments
AC_SYS_LARGEFILE
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
AS_IF([test "x$debug" = xyes],
[AC_DEFINE([FLM_DEBUG], [1], [Define to enable FLAIM debug features])])
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
@@ -125,8 +121,7 @@ case $host in
fi ;;
*-apple-darwin*)
AC_DEFINE([OSX], [],
[Define if building on Apple OSX.]) ;;
AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;;
*-*-aix*)
if "x$CXX" != "xg++"; then
@@ -141,10 +136,12 @@ case $host in
esac
AC_CONFIG_FILES([Makefile
docs/Makefile
obs/Makefile
obs/ftk.spec
src/Makefile
util/Makefile])
util/Makefile
libflaimtk.pc])
AC_OUTPUT

View File

@@ -1,10 +1,10 @@
FTKINC = -I$(top_srcdir)/src
FTKLIB = ../src/libflaimtk.la
FTK_INCLUDE = -I$(top_srcdir)/src
FTK_LTLIB = ../src/libflaimtk.la
check_PROGRAMS = ftktest
ftktest_SOURCES = ftktest.cpp
ftktest_CPPFLAGS = $(FTKINC)
ftktest_LDADD = $(FTKLIB)
ftktest_CPPFLAGS = $(FTK_INCLUDE)
ftktest_LDADD = $(FTK_LTLIB)
TESTS = ftktest

View File

@@ -2,17 +2,19 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = GNUMakefile README.W32 win32
SUBDIRS = $(subdirs) src obs
SUBDIRS = src obs
doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libflaimsql.pc
RPM = rpm
rpms srcrpm: dist
$(MAKE) -C obs $(AM_MAKEFLAGS) $@
rpmarch=`rpm --showrc | grep ^build\ arch | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z $$rpmarch || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
cd obj && $(MAKE) $(AM_MAKEFLAGS) $@
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)
dist-hook:

View File

@@ -32,9 +32,12 @@ AC_ARG_ENABLE([debug],
# Create Automake conditional based on the DOXYGEN variable
AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x])
# Configure for large files, even on 32-bit systems
AC_SYS_LARGEFILE
# Check for pthreads
ACX_PTHREAD(
[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
[AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
@@ -51,13 +54,9 @@ AC_C_INLINE
# Checks for library functions.
# Configure for large files, even on 32-bit systems
AC_SYS_LARGEFILE
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
AS_IF([test "x$debug" = xyes],
[AC_DEFINE([FLM_DEBUG], [1], [Define to enable FLAIM debug features])])
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
@@ -95,8 +94,7 @@ case $host in
fi ;;
*-apple-darwin*)
AC_DEFINE([OSX], [],
[Define if building on Apple OSX.]) ;;
AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;;
*-*-aix*)
if "x$CXX" != "xg++"; then

View File

@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libflaimsql
Name: FLAIMSQL
URL: http://forge.novell.com/modules/xfmod/project/?flaim
Description: Embeddable cross-platform SQL database engine
Version: @VERSION@
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -lflaimsql -L${libdir}
Version: @PACKAGE_VERSION@
Requires: libflaimtk >= 1.0
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -L${libdir} -lflaimsql
Cflags: -I${includedir}

View File

@@ -2,17 +2,19 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = GNUMakefile README.W32 debian netware win32
SUBDIRS = $(subdirs) src util sample docs obs
SUBDIRS = src util sample docs obs
doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxflaim.pc
RPM = rpm
rpms srcrpm: dist
$(MAKE) -C obs $(AM_MAKEFLAGS) $@
rpmarch=`rpm --showrc | grep ^build\ arch | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z $$rpmarch || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)
dist-hook:

View File

@@ -37,31 +37,22 @@ AC_ARG_ENABLE([debug],
# Automake conditionals
AM_CONDITIONAL([HAVE_JAVA], [test "x$ac_prog_have_jni" = xyes])
if test "x$ac_prog_have_jni" = xyes; then
AC_CONFIG_FILES([src/java/Makefile
src/java/wrapper/Makefile])
fi
AM_CONDITIONAL([HAVE_CSHARP], [test -n "$CSC"])
if test -n "$CSC"; then
AC_CONFIG_FILES([src/cs/Makefile
src/cs/wrapper/Makefile])
fi
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
if test -n "$DOXYGEN"; then
AC_CONFIG_FILES([docs/doxygen/Makefile
docs/doxygen/doxyfile])
fi
#AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/doxygen/doxyfile])])
AS_IF([test -n "$DOXYGEN"], [AC_CONFIG_FILES([docs/doxygen/doxyfile])])
# Configure for large files, even on 32-bit systems
AC_SYS_LARGEFILE
# Check for pthreads
ACX_PTHREAD(
[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
CC="$PTHREAD_CC"
CXX="$PTHREAD_CXX"])
[AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
CC="$PTHREAD_CC"
CXX="$PTHREAD_CXX"])
# Checks for libraries.
@@ -76,13 +67,9 @@ AC_TYPE_SIZE_T
# Checks for library functions.
AC_CHECK_FUNCS([atexit strerror])
# Configure for large files, even on 32-bit systems
AC_SYS_LARGEFILE
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
AS_IF([test "x$debug" = xyes],
[AC_DEFINE([FLM_DEBUG], [1], [Define to enable FLAIM debug features])])
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
@@ -120,8 +107,7 @@ case $host in
fi ;;
*-apple-darwin*)
AC_DEFINE([OSX], [],
[Define if building on Apple OSX.]) ;;
AC_DEFINE([OSX], [], [Define if building on Apple OSX.]) ;;
*-*-aix*)
if "x$CXX" != "xg++"; then
@@ -137,10 +123,15 @@ esac
AC_CONFIG_FILES([Makefile
docs/Makefile
docs/doxygen/Makefile
obs/Makefile
obs/xflaim.spec
sample/Makefile
src/Makefile
src/cs/Makefile
src/cs/wrapper/Makefile
src/java/Makefile
src/java/wrapper/Makefile
util/Makefile
libxflaim.pc])
AC_OUTPUT

View File

@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libxflaim
Description: Embeddable cross-platform XML database engine
Version: @VERSION@
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -lxflaim -L${libdir}
Name: XFLAIM
URL: http://forge.novell.com/modules/xfmod/project/?flaim
Description: An embeddable cross-platform XML database engine
Version: @PACKAGE_VERSION@
Requires: libflaimtk >= 1.0
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -L${libdir} -lxflaim
Cflags: -I${includedir}

View File

@@ -1,16 +1,14 @@
SUBDIRS =
if HAVE_JAVA
SUBDIRS += java
JAVADIR = java
JNI_LIBADD=java/libxfjni.la
endif
if HAVE_CSHARP
SUBDIRS += cs
CSDIR = cs
CSI_LIBADD=cs/libxfcsi.la
endif
SUBDIRS += .
SUBDIRS = $(JAVADIR) $(CSDIR)
lib_LTLIBRARIES = libxflaim.la
include_HEADERS = xflaim.h

View File

@@ -3,39 +3,8 @@ EXTRA_DIST = dbdiff.cpp dbdiff.h domedit.cpp diffbackups.cpp xmlfiles
XFLAIM_INCLUDE = -I$(top_srcdir)/src
XFLAIM_LDADD = ../src/libxflaim.la
## Utility Programs
bin_PROGRAMS = xflmcheckdb xflmrebuild xflmview xflmdbshell
xflmcheckdb_SOURCES = checkdb.cpp
xflmcheckdb_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
xflmcheckdb_LDADD = libutil.la $(XFLAIM_LDADD)
xflmrebuild_SOURCES = rebuild.cpp
xflmrebuild_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
xflmrebuild_LDADD = libutil.la $(XFLAIM_LDADD)
xflmview_SOURCES = \
viewblk.cpp \
view.cpp \
viewdisp.cpp \
viewedit.cpp \
viewhdr.cpp \
view.h \
viewlfil.cpp \
viewmenu.cpp \
viewsrch.cpp
xflmview_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
xflmview_LDADD = libutil.la $(XFLAIM_LDADD)
xflmdbshell_SOURCES = \
domedit.h \
fdomedt.cpp \
fshell.cpp \
fshell.h \
xshell.cpp
xflmdbshell_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
xflmdbshell_LDADD = libutil.la $(XFLAIM_LDADD)
AM_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
LDADD = libutil.la $(XFLAIM_LDADD)
## Utility Convenience Library
@@ -48,7 +17,34 @@ libutil_la_SOURCES = \
flm_lutl.h \
sharutil.cpp \
sharutil.h
libutil_la_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
libutil_la_LIBADD = $(XFLAIM_LDADD)
## Utility Programs
bin_PROGRAMS = xflmcheckdb xflmrebuild xflmview xflmdbshell
xflmcheckdb_SOURCES = checkdb.cpp
xflmcheckdb_LDADD = libutil.la
xflmrebuild_SOURCES = rebuild.cpp
xflmview_SOURCES = \
viewblk.cpp \
view.cpp \
viewdisp.cpp \
viewedit.cpp \
viewhdr.cpp \
view.h \
viewlfil.cpp \
viewmenu.cpp \
viewsrch.cpp
xflmdbshell_SOURCES = \
domedit.h \
fdomedt.cpp \
fshell.cpp \
fshell.h \
xshell.cpp
## Check Programs
@@ -80,92 +76,27 @@ check_DATA = copy-xml-files.stamp
check_HEADERS = flmunittest.h
ut_basictest_SOURCES = flmunittest.cpp basictestsrv.cpp
ut_basictest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_basictest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_binarytest_SOURCES = flmunittest.cpp binarytest.cpp
ut_binarytest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_binarytest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_colldeftest_SOURCES = flmunittest.cpp colldeftestsrv.cpp
ut_colldeftest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_colldeftest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_dictchangetest_SOURCES = flmunittest.cpp dictchangetest.cpp
ut_dictchangetest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_dictchangetest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_dictdeftest_SOURCES = flmunittest.cpp dictdeftestsrv.cpp
ut_dictdeftest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_dictdeftest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_dirtyexittest_SOURCES = flmunittest.cpp dirtyexittest1srv.cpp
ut_dirtyexittest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_dirtyexittest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_dirtyexittest2_SOURCES = flmunittest.cpp dirtyexittest2srv.cpp
ut_dirtyexittest2_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_dirtyexittest2_LDADD = libutil.la $(XFLAIM_LDADD)
ut_domnodetest_SOURCES = flmunittest.cpp domnodetestsrv.cpp
ut_domnodetest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_domnodetest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_enctest_SOURCES = flmunittest.cpp enctestsrv.cpp
ut_enctest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_enctest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_importtest_SOURCES = flmunittest.cpp importtestsrv.cpp
ut_importtest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_importtest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_indexdeftest_SOURCES = flmunittest.cpp indexdeftestsrv.cpp
ut_indexdeftest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_indexdeftest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_indextest_SOURCES = flmunittest.cpp indextest1srv.cpp
ut_indextest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_indextest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_indextest2_SOURCES = flmunittest.cpp indextest2srv.cpp
ut_indextest2_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_indextest2_LDADD = libutil.la $(XFLAIM_LDADD)
ut_indextest3_SOURCES = flmunittest.cpp indextest3.cpp
ut_indextest3_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_indextest3_LDADD = libutil.la $(XFLAIM_LDADD)
ut_metaphonetest_SOURCES = flmunittest.cpp metaphonetestsrv.cpp
ut_metaphonetest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_metaphonetest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_namespacetest_SOURCES = flmunittest.cpp namespacetestsrv.cpp
ut_namespacetest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_namespacetest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_regressiontest_SOURCES = flmunittest.cpp regressiontest.cpp
ut_regressiontest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_regressiontest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_rfltest_SOURCES = flmunittest.cpp rfltestsrv.cpp
ut_rfltest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_rfltest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_sortkeytest_SOURCES = flmunittest.cpp sortkeytest.cpp
ut_sortkeytest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_sortkeytest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_sortkeytest2_SOURCES = flmunittest.cpp sortkeytest2.cpp
ut_sortkeytest2_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_sortkeytest2_LDADD = libutil.la $(XFLAIM_LDADD)
ut_xpathtest_SOURCES = flmunittest.cpp xpathtest1srv.cpp
ut_xpathtest_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_xpathtest_LDADD = libutil.la $(XFLAIM_LDADD)
ut_xpathtest2_SOURCES = flmunittest.cpp xpathtest2srv.cpp
ut_xpathtest2_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)
ut_xpathtest2_LDADD = libutil.la $(XFLAIM_LDADD)
## Unit Tests
@@ -205,3 +136,4 @@ clean-local:
rm -rf tst.bak
rm -f *.xml
rm -f copy-xml-files.stamp