From 62fc7e082fc3d36db5e92bb6000d689de3c932ee Mon Sep 17 00:00:00 2001 From: jcalcote Date: Tue, 28 Jul 2009 18:39:19 +0000 Subject: [PATCH] Updated build system as per Ralf's suggestions to Chapter 9 in Autotools book. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1108 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/Makefile.am | 8 ++- flaim/configure.ac | 42 ++++++++------- ...try_doxygen.m4 => flm_prog_try_doxygen.m4} | 8 +-- flaim/obs/Makefile.am | 20 ++++---- flaim/src/Makefile.am | 3 ++ flaim/{ => src}/libflaim.pc.in | 0 ftk/Makefile.am | 7 +-- ftk/configure.ac | 41 ++++++++------- ...try_doxygen.m4 => flm_prog_try_doxygen.m4} | 8 +-- ftk/obs/Makefile.am | 21 ++++---- ftk/src/Makefile.am | 3 ++ ftk/{ => src}/libflaimtk.pc.in | 0 sql/Makefile.am | 8 ++- sql/configure.ac | 42 ++++++++------- ...try_doxygen.m4 => flm_prog_try_doxygen.m4} | 8 +-- sql/obs/Makefile.am | 21 ++++---- sql/src/Makefile.am | 3 ++ sql/{ => src}/libflaimsql.pc.in | 0 xflaim/Makefile.am | 8 ++- xflaim/configure.ac | 51 ++++++++++--------- ...ac_prog_try_csc.m4 => flm_prog_try_csc.m4} | 8 +-- ..._prog_try_csvm.m4 => flm_prog_try_csvm.m4} | 8 +-- ...try_doxygen.m4 => flm_prog_try_doxygen.m4} | 8 +-- ...ac_prog_try_jar.m4 => flm_prog_try_jar.m4} | 8 +-- ..._prog_try_java.m4 => flm_prog_try_java.m4} | 8 +-- ...rog_try_javac.m4 => flm_prog_try_javac.m4} | 8 +-- ...try_javadoc.m4 => flm_prog_try_javadoc.m4} | 8 +-- ...rog_try_javah.m4 => flm_prog_try_javah.m4} | 8 +-- ...ac_prog_try_jni.m4 => flm_prog_try_jni.m4} | 14 ++--- xflaim/obs/Makefile.am | 21 ++++---- xflaim/src/Makefile.am | 3 ++ xflaim/src/cs/wrapper/Makefile.am | 11 ++-- xflaim/src/java/wrapper/Makefile.am | 10 ++-- xflaim/{ => src}/libxflaim.pc.in | 0 34 files changed, 222 insertions(+), 203 deletions(-) rename flaim/m4/{ac_prog_try_doxygen.m4 => flm_prog_try_doxygen.m4} (86%) rename flaim/{ => src}/libflaim.pc.in (100%) rename ftk/m4/{ac_prog_try_doxygen.m4 => flm_prog_try_doxygen.m4} (86%) rename ftk/{ => src}/libflaimtk.pc.in (100%) rename sql/m4/{ac_prog_try_doxygen.m4 => flm_prog_try_doxygen.m4} (86%) rename sql/{ => src}/libflaimsql.pc.in (100%) rename xflaim/m4/{ac_prog_try_csc.m4 => flm_prog_try_csc.m4} (87%) rename xflaim/m4/{ac_prog_try_csvm.m4 => flm_prog_try_csvm.m4} (86%) rename xflaim/m4/{ac_prog_try_doxygen.m4 => flm_prog_try_doxygen.m4} (86%) rename xflaim/m4/{ac_prog_try_jar.m4 => flm_prog_try_jar.m4} (86%) rename xflaim/m4/{ac_prog_try_java.m4 => flm_prog_try_java.m4} (86%) rename xflaim/m4/{ac_prog_try_javac.m4 => flm_prog_try_javac.m4} (86%) rename xflaim/m4/{ac_prog_try_javadoc.m4 => flm_prog_try_javadoc.m4} (86%) rename xflaim/m4/{ac_prog_try_javah.m4 => flm_prog_try_javah.m4} (85%) rename xflaim/m4/{ac_prog_try_jni.m4 => flm_prog_try_jni.m4} (85%) rename xflaim/{ => src}/libxflaim.pc.in (100%) diff --git a/flaim/Makefile.am b/flaim/Makefile.am index 21d59e0..3b18762 100644 --- a/flaim/Makefile.am +++ b/flaim/Makefile.am @@ -6,18 +6,16 @@ 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 (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) - rm -rf $(distdir) + test -z "obs/$$rpmarch" || ( mv obs/$$rpmarch/* . && rm -rf obs/$$rpmarch ) + rm -rf obs/$(distdir) dist-hook: rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms + diff --git a/flaim/configure.ac b/flaim/configure.ac index 6be7818..07c68a0 100644 --- a/flaim/configure.ac +++ b/flaim/configure.ac @@ -19,7 +19,7 @@ AC_PROG_LN_S AC_PROG_INSTALL # Checks for optional programs. -AC_PROG_TRY_DOXYGEN +FLM_PROG_TRY_DOXYGEN # Configure FTKLIB, FTKINC, FTK_LTLIB and FTK_INCLUDE FLM_FTK_SEARCH @@ -87,30 +87,34 @@ gcc_opt_flags="-O -foptimize-sibling-calls case $host in sparc-*-solaris*) LDFLAGS="$LDFLAGS -R /usr/lib/lwp" - if "x$CXX" != "xg++"; then - if "x$debug" = xno; then - CXXFLAGS="$CXXFLAGS -xO3" - fi - SUN_STUDIO_COMPILER=`"$CXX" -V | grep "Sun C++"` - if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then - CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" - fi - fi ;; + case $CXX in + *g++*) ;; + *) + if "x$debug" = xno; then + CXXFLAGS="$CXXFLAGS -xO3" + fi + SUN_STUDIO_COMPILER=`$CXX -V | grep "Sun C++"` + if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then + CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" + fi ;; + esac ;; *-apple-darwin*) AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;; *-*-aix*) - if "x$CXX" != "xg++"; then - CXXFLAGS="$CXXFLAGS -qstrict -q$build_bits" - LDFLAGS="$LDFLAGS -q$build_bits -X$build_bits" - fi ;; + case $CXX in + *g++*) ;; + *) CXXFLAGS="$CXXFLAGS -qstrict" ;; + esac ;; *-*-hpux*) - if "x$CXX" != "xg++"; then - # Disable "Placement operator delete invocation is not yet implemented" warning - CXXFLAGS="$CXXFLAGS +W930" - fi ;; + case $CXX in + *g++*) ;; + *) + # Disable "Placement operator delete invocation is not yet implemented" warning + CXXFLAGS="$CXXFLAGS +W930" ;; + esac ;; esac AC_CONFIG_FILES([Makefile @@ -121,7 +125,7 @@ AC_CONFIG_FILES([Makefile sample/Makefile src/Makefile util/Makefile - libflaim.pc]) + src/libflaim.pc]) AC_OUTPUT echo " diff --git a/flaim/m4/ac_prog_try_doxygen.m4 b/flaim/m4/flm_prog_try_doxygen.m4 similarity index 86% rename from flaim/m4/ac_prog_try_doxygen.m4 rename to flaim/m4/flm_prog_try_doxygen.m4 index 06b39ab..5283cc0 100644 --- a/flaim/m4/ac_prog_try_doxygen.m4 +++ b/flaim/m4/flm_prog_try_doxygen.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_DOXYGEN(["quiet"]) +# FLM_PROG_TRY_DOXYGEN(["quiet"]) # ------------------------------ -# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# FLM_PROG_TRY_DOXYGEN tests for an existing doxygen source # documentation program. It sets or uses the environment # variable DOXYGEN. # @@ -19,7 +19,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_DOXYGEN], +AC_DEFUN([FLM_PROG_TRY_DOXYGEN], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) @@ -27,4 +27,4 @@ ifelse([$1],, [if test -z "$DOXYGEN"; then AC_MSG_WARN([Doxygen program not found - continuing without Doxygen]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_DOXYGEN +])# FLM_PROG_TRY_DOXYGEN diff --git a/flaim/obs/Makefile.am b/flaim/obs/Makefile.am index f0d255b..d8e5f59 100644 --- a/flaim/obs/Makefile.am +++ b/flaim/obs/Makefile.am @@ -1,26 +1,26 @@ rpmspec = $(PACKAGE_TARNAME).spec rpmmacros =\ - --define='_rpmdir $(PWD)/..'\ - --define='_srcrpmdir $(PWD)/..'\ - --define='_sourcedir $(PWD)/..'\ - --define='_specdir $(PWD)/..'\ - --define='_builddir $(PWD)/..' + --define="_rpmdir $${PWD}"\ + --define="_srcrpmdir $${PWD}"\ + --define="_sourcedir $${PWD}/.."\ + --define="_specdir $${PWD}"\ + --define="_builddir $${PWD}" -rpmopts = --nodeps --buildroot='$(PWD)/_rpm' +RPMBUILD = rpmbuild +RPMFLAGS = --nodeps --buildroot="$${PWD}/_rpm" rpmcheck: - @which rpmbuild &> /dev/null; \ - if [ $$? -ne 0 ]; then \ + if [ which rpmbuild &> /dev/null ]; then \ echo "*** This make target requires an rpm-based linux distribution."; \ (exit 1); exit 1; \ fi srcrpm: rpmcheck $(rpmspec) - rpmbuild -bs $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -bs $(rpmmacros) $(rpmspec) rpms: rpmcheck $(rpmspec) - rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -ba $(rpmmacros) $(rpmspec) .PHONY: rpmcheck srcrpm rpms diff --git a/flaim/src/Makefile.am b/flaim/src/Makefile.am index 653cb9f..e74c40d 100644 --- a/flaim/src/Makefile.am +++ b/flaim/src/Makefile.am @@ -1,6 +1,9 @@ lib_LTLIBRARIES = libflaim.la include_HEADERS = flaim.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libflaim.pc + libflaim_la_SOURCES = \ checksum.cpp \ fblob.cpp \ diff --git a/flaim/libflaim.pc.in b/flaim/src/libflaim.pc.in similarity index 100% rename from flaim/libflaim.pc.in rename to flaim/src/libflaim.pc.in diff --git a/ftk/Makefile.am b/ftk/Makefile.am index f7f1486..596f14d 100644 --- a/ftk/Makefile.am +++ b/ftk/Makefile.am @@ -10,16 +10,13 @@ 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 (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) - rm -rf $(distdir) + test -z "obs/$$rpmarch" || ( mv obs/$$rpmarch/* . && rm -rf obs/$$rpmarch ) + rm -rf obs/$(distdir) dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/ftk/configure.ac b/ftk/configure.ac index 3f0e550..07fdccd 100644 --- a/ftk/configure.ac +++ b/ftk/configure.ac @@ -18,7 +18,7 @@ AC_PROG_CXX AC_PROG_INSTALL # Checks for optional programs. -AC_PROG_TRY_DOXYGEN +FLM_PROG_TRY_DOXYGEN # Configure options: --enable-debug[=no]. AC_ARG_ENABLE([debug], @@ -110,29 +110,34 @@ gcc_opt_flags="-O -foptimize-sibling-calls case $host in sparc-*-solaris*) LDFLAGS="$LDFLAGS -R /usr/lib/lwp" - if "x$CXX" != "xg++"; then - if "x$debug" = xno; then - CXXFLAGS="$CXXFLAGS -xO3" - fi - SUN_STUDIO_COMPILER=`"$CXX" -V | grep "Sun C++"` - if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then - CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" - fi - fi ;; + case $CXX in + *g++*) ;; + *) + if "x$debug" = xno; then + CXXFLAGS="$CXXFLAGS -xO3" + fi + SUN_STUDIO_COMPILER=`$CXX -V | grep "Sun C++"` + if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then + CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" + fi ;; + esac ;; *-apple-darwin*) AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;; *-*-aix*) - if "x$CXX" != "xg++"; then - CXXFLAGS="$CXXFLAGS -qstrict" - fi ;; + case $CXX in + *g++*) ;; + *) CXXFLAGS="$CXXFLAGS -qstrict" ;; + esac ;; *-*-hpux*) - if "x$CXX" != "xg++"; then - # Disable "Placement operator delete invocation is not yet implemented" warning - CXXFLAGS="$CXXFLAGS +W930" - fi ;; + case $CXX in + *g++*) ;; + *) + # Disable "Placement operator delete invocation is not yet implemented" warning + CXXFLAGS="$CXXFLAGS +W930" ;; + esac ;; esac AC_CONFIG_FILES([Makefile @@ -141,7 +146,7 @@ AC_CONFIG_FILES([Makefile obs/flaimtk.spec src/Makefile util/Makefile - libflaimtk.pc]) + src/libflaimtk.pc]) AC_OUTPUT diff --git a/ftk/m4/ac_prog_try_doxygen.m4 b/ftk/m4/flm_prog_try_doxygen.m4 similarity index 86% rename from ftk/m4/ac_prog_try_doxygen.m4 rename to ftk/m4/flm_prog_try_doxygen.m4 index 06b39ab..5283cc0 100644 --- a/ftk/m4/ac_prog_try_doxygen.m4 +++ b/ftk/m4/flm_prog_try_doxygen.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_DOXYGEN(["quiet"]) +# FLM_PROG_TRY_DOXYGEN(["quiet"]) # ------------------------------ -# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# FLM_PROG_TRY_DOXYGEN tests for an existing doxygen source # documentation program. It sets or uses the environment # variable DOXYGEN. # @@ -19,7 +19,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_DOXYGEN], +AC_DEFUN([FLM_PROG_TRY_DOXYGEN], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) @@ -27,4 +27,4 @@ ifelse([$1],, [if test -z "$DOXYGEN"; then AC_MSG_WARN([Doxygen program not found - continuing without Doxygen]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_DOXYGEN +])# FLM_PROG_TRY_DOXYGEN diff --git a/ftk/obs/Makefile.am b/ftk/obs/Makefile.am index 440d67b..d8e5f59 100644 --- a/ftk/obs/Makefile.am +++ b/ftk/obs/Makefile.am @@ -1,25 +1,26 @@ rpmspec = $(PACKAGE_TARNAME).spec rpmmacros =\ - --define='_rpmdir $(PWD)/..'\ - --define='_srcrpmdir $(PWD)/..'\ - --define='_sourcedir $(PWD)/..'\ - --define='_specdir $(PWD)/..'\ - --define='_builddir $(PWD)/..' + --define="_rpmdir $${PWD}"\ + --define="_srcrpmdir $${PWD}"\ + --define="_sourcedir $${PWD}/.."\ + --define="_specdir $${PWD}"\ + --define="_builddir $${PWD}" -rpmopts = --nodeps --buildroot='$(PWD)/_rpm' +RPMBUILD = rpmbuild +RPMFLAGS = --nodeps --buildroot="$${PWD}/_rpm" rpmcheck: - @which rpmbuild &> /dev/null; \ - if [ $$? -ne 0 ]; then \ + if [ which rpmbuild &> /dev/null ]; then \ echo "*** This make target requires an rpm-based linux distribution."; \ (exit 1); exit 1; \ fi srcrpm: rpmcheck $(rpmspec) - rpmbuild -bs $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -bs $(rpmmacros) $(rpmspec) rpms: rpmcheck $(rpmspec) - rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -ba $(rpmmacros) $(rpmspec) .PHONY: rpmcheck srcrpm rpms + diff --git a/ftk/src/Makefile.am b/ftk/src/Makefile.am index bc21e1d..7336372 100644 --- a/ftk/src/Makefile.am +++ b/ftk/src/Makefile.am @@ -3,6 +3,9 @@ EXTRA_DIST = ftknlm.h lib_LTLIBRARIES = libflaimtk.la include_HEADERS = flaimtk.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libflaimtk.pc + libflaimtk_la_SOURCES = \ ftkarg.cpp \ ftkbtree.cpp \ diff --git a/ftk/libflaimtk.pc.in b/ftk/src/libflaimtk.pc.in similarity index 100% rename from ftk/libflaimtk.pc.in rename to ftk/src/libflaimtk.pc.in diff --git a/sql/Makefile.am b/sql/Makefile.am index 4e6d7f0..6206d26 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -6,18 +6,16 @@ SUBDIRS = src obs doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libflaimsql.pc - RPM = rpm rpms srcrpm: dist (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) - rm -rf $(distdir) + test -z "obs/$$rpmarch" || ( mv obs/$$rpmarch/* . && rm -rf obs/$$rpmarch ) + rm -rf obs/$(distdir) dist-hook: rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms + diff --git a/sql/configure.ac b/sql/configure.ac index 3e6d891..b8aa4e6 100644 --- a/sql/configure.ac +++ b/sql/configure.ac @@ -18,7 +18,7 @@ AC_PROG_CXX AC_PROG_INSTALL # Checks for optional programs. -AC_PROG_TRY_DOXYGEN +FLM_PROG_TRY_DOXYGEN # Configure FTKLIB, FTKINC, FTK_LTLIB and FTK_INCLUDE FLM_FTK_SEARCH @@ -83,37 +83,41 @@ gcc_opt_flags="-O -foptimize-sibling-calls case $host in sparc-*-solaris*) LDFLAGS="$LDFLAGS -R /usr/lib/lwp" - if "x$CXX" != "xg++"; then - if "x$debug" = xno; then - CXXFLAGS="$CXXFLAGS -xO3" - fi - SUN_STUDIO_COMPILER=`"$CXX" -V | grep "Sun C++"` - if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then - CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" - fi - fi ;; + case $CXX in + *g++*) ;; + *) + if "x$debug" = xno; then + CXXFLAGS="$CXXFLAGS -xO3" + fi + SUN_STUDIO_COMPILER=`$CXX -V | grep "Sun C++"` + if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then + CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" + fi ;; + esac ;; *-apple-darwin*) AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;; *-*-aix*) - if "x$CXX" != "xg++"; then - CXXFLAGS="$CXXFLAGS -qstrict -q$build_bits" - LDFLAGS="$LDFLAGS -q$build_bits -X$build_bits" - fi ;; + case $CXX in + *g++*) ;; + *) CXXFLAGS="$CXXFLAGS -qstrict" ;; + esac ;; *-*-hpux*) - if "x$CXX" != "xg++"; then - # Disable "Placement operator delete invocation is not yet implemented" warning - CXXFLAGS="$CXXFLAGS +W930" - fi ;; + case $CXX in + *g++*) ;; + *) + # Disable "Placement operator delete invocation is not yet implemented" warning + CXXFLAGS="$CXXFLAGS +W930" ;; + esac ;; esac AC_CONFIG_FILES([Makefile obs/sqlflaim.spec obs/Makefile src/Makefile - libflaimsql.pc]) + src/libflaimsql.pc]) AC_OUTPUT echo " diff --git a/sql/m4/ac_prog_try_doxygen.m4 b/sql/m4/flm_prog_try_doxygen.m4 similarity index 86% rename from sql/m4/ac_prog_try_doxygen.m4 rename to sql/m4/flm_prog_try_doxygen.m4 index 06b39ab..5283cc0 100644 --- a/sql/m4/ac_prog_try_doxygen.m4 +++ b/sql/m4/flm_prog_try_doxygen.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_DOXYGEN(["quiet"]) +# FLM_PROG_TRY_DOXYGEN(["quiet"]) # ------------------------------ -# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# FLM_PROG_TRY_DOXYGEN tests for an existing doxygen source # documentation program. It sets or uses the environment # variable DOXYGEN. # @@ -19,7 +19,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_DOXYGEN], +AC_DEFUN([FLM_PROG_TRY_DOXYGEN], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) @@ -27,4 +27,4 @@ ifelse([$1],, [if test -z "$DOXYGEN"; then AC_MSG_WARN([Doxygen program not found - continuing without Doxygen]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_DOXYGEN +])# FLM_PROG_TRY_DOXYGEN diff --git a/sql/obs/Makefile.am b/sql/obs/Makefile.am index 440d67b..d8e5f59 100644 --- a/sql/obs/Makefile.am +++ b/sql/obs/Makefile.am @@ -1,25 +1,26 @@ rpmspec = $(PACKAGE_TARNAME).spec rpmmacros =\ - --define='_rpmdir $(PWD)/..'\ - --define='_srcrpmdir $(PWD)/..'\ - --define='_sourcedir $(PWD)/..'\ - --define='_specdir $(PWD)/..'\ - --define='_builddir $(PWD)/..' + --define="_rpmdir $${PWD}"\ + --define="_srcrpmdir $${PWD}"\ + --define="_sourcedir $${PWD}/.."\ + --define="_specdir $${PWD}"\ + --define="_builddir $${PWD}" -rpmopts = --nodeps --buildroot='$(PWD)/_rpm' +RPMBUILD = rpmbuild +RPMFLAGS = --nodeps --buildroot="$${PWD}/_rpm" rpmcheck: - @which rpmbuild &> /dev/null; \ - if [ $$? -ne 0 ]; then \ + if [ which rpmbuild &> /dev/null ]; then \ echo "*** This make target requires an rpm-based linux distribution."; \ (exit 1); exit 1; \ fi srcrpm: rpmcheck $(rpmspec) - rpmbuild -bs $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -bs $(rpmmacros) $(rpmspec) rpms: rpmcheck $(rpmspec) - rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -ba $(rpmmacros) $(rpmspec) .PHONY: rpmcheck srcrpm rpms + diff --git a/sql/src/Makefile.am b/sql/src/Makefile.am index a4a4b7f..4418d30 100644 --- a/sql/src/Makefile.am +++ b/sql/src/Makefile.am @@ -1,6 +1,9 @@ lib_LTLIBRARIES = libflaimsql.la include_HEADERS = flaimsql.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libflaimsql.pc + libflaimsql_la_SOURCES = \ btreeinfo.cpp \ checksum.cpp \ diff --git a/sql/libflaimsql.pc.in b/sql/src/libflaimsql.pc.in similarity index 100% rename from sql/libflaimsql.pc.in rename to sql/src/libflaimsql.pc.in diff --git a/xflaim/Makefile.am b/xflaim/Makefile.am index b425ef7..3b18762 100644 --- a/xflaim/Makefile.am +++ b/xflaim/Makefile.am @@ -6,18 +6,16 @@ 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 (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) - rm -rf $(distdir) + test -z "obs/$$rpmarch" || ( mv obs/$$rpmarch/* . && rm -rf obs/$$rpmarch ) + rm -rf obs/$(distdir) dist-hook: rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms + diff --git a/xflaim/configure.ac b/xflaim/configure.ac index c66e6af..212137d 100644 --- a/xflaim/configure.ac +++ b/xflaim/configure.ac @@ -20,11 +20,11 @@ AC_PROG_LN_S AC_PROG_INSTALL # Checks for optional programs. -AC_PROG_TRY_CSC -AC_PROG_TRY_CSVM -AC_PROG_TRY_JNI -AC_PROG_TRY_JAVADOC -AC_PROG_TRY_DOXYGEN +FLM_PROG_TRY_CSC +FLM_PROG_TRY_CSVM +FLM_PROG_TRY_JNI +FLM_PROG_TRY_JAVADOC +FLM_PROG_TRY_DOXYGEN # Configure FTKLIB, FTKINC, FTK_LTLIB and FTK_INCLUDE FLM_FTK_SEARCH @@ -96,29 +96,34 @@ gcc_opt_flags="-O -foptimize-sibling-calls case $host in sparc-*-solaris*) LDFLAGS="$LDFLAGS -R /usr/lib/lwp" - if "x$CXX" != "xg++"; then - if "x$debug" = xno; then - CXXFLAGS="$CXXFLAGS -xO3" - fi - SUN_STUDIO_COMPILER=`"$CXX" -V | grep "Sun C++"` - if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then - CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" - fi - fi ;; + case $CXX in + *g++*) ;; + *) + if "x$debug" = xno; then + CXXFLAGS="$CXXFLAGS -xO3" + fi + SUN_STUDIO_COMPILER=`$CXX -V | grep "Sun C++"` + if "x$SUN_STUDIO_COMPILER" = "xSun C++"; then + CXXFLAGS="$CXXFLAGS -errwarn=%all -errtags -erroff=hidef,inllargeuse,doubunder" + fi ;; + esac ;; *-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 - CXXFLAGS="$CXXFLAGS -qstrict" - fi ;; + case $CXX in + *g++*) ;; + *) CXXFLAGS="$CXXFLAGS -qstrict" ;; + esac ;; *-*-hpux*) - if "x$CXX" != "xg++"; then - # Disable "Placement operator delete invocation is not yet implemented" warning - CXXFLAGS="$CXXFLAGS +W930" - fi ;; + case $CXX in + *g++*) ;; + *) + # Disable "Placement operator delete invocation is not yet implemented" warning + CXXFLAGS="$CXXFLAGS +W930" ;; + esac ;; esac AC_CONFIG_FILES([Makefile @@ -133,7 +138,7 @@ AC_CONFIG_FILES([Makefile src/java/Makefile src/java/wrapper/Makefile util/Makefile - libxflaim.pc]) + src/libxflaim.pc]) AC_OUTPUT echo " diff --git a/xflaim/m4/ac_prog_try_csc.m4 b/xflaim/m4/flm_prog_try_csc.m4 similarity index 87% rename from xflaim/m4/ac_prog_try_csc.m4 rename to xflaim/m4/flm_prog_try_csc.m4 index 183e31b..e5a4d56 100644 --- a/xflaim/m4/ac_prog_try_csc.m4 +++ b/xflaim/m4/flm_prog_try_csc.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_CSC(["quiet"]) +# FLM_PROG_TRY_CSC(["quiet"]) # -------------------------- -# AC_PROG_TRY_CSC tests for an existing CSharp compiler. It sets +# FLM_PROG_TRY_CSC tests for an existing CSharp compiler. It sets # or uses the environment variable CSC. # # It checks for a Mono CSharp compiler (msc) and then for a @@ -21,7 +21,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_CSC], +AC_DEFUN([FLM_PROG_TRY_CSC], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([CSC], [CSharp compiler])dnl AC_CHECK_PROGS([CSC], [mcs$EXEEXT csc$EXEEXT]) @@ -29,4 +29,4 @@ ifelse([$1],, [if test -z "$CSC"; then AC_MSG_WARN([CSharp compiler not found - continuing without CSharp]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_CSC +])# FLM_PROG_TRY_CSC diff --git a/xflaim/m4/ac_prog_try_csvm.m4 b/xflaim/m4/flm_prog_try_csvm.m4 similarity index 86% rename from xflaim/m4/ac_prog_try_csvm.m4 rename to xflaim/m4/flm_prog_try_csvm.m4 index 4c5c96e..222cc81 100644 --- a/xflaim/m4/ac_prog_try_csvm.m4 +++ b/xflaim/m4/flm_prog_try_csvm.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_CSVM(["quiet"]) +# FLM_PROG_TRY_CSVM(["quiet"]) # --------------------------- -# AC_PROG_TRY_CSVM tests for an existing CSharp virtual machine. +# FLM_PROG_TRY_CSVM tests for an existing CSharp virtual machine. # It sets or uses the environment variable CSVM. # # If no arguments are given to this macro, and no CSharp virtual @@ -18,7 +18,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_CSVM], +AC_DEFUN([FLM_PROG_TRY_CSVM], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([CSVM], [CSharp virtual machine])dnl AC_CHECK_PROGS([CSVM], [mono$EXEEXT cs$EXEEXT]) @@ -26,4 +26,4 @@ ifelse([$1],, [if test -z "$CSVM"; then AC_MSG_WARN([CSharp VM not found - continuing without CSharp VM]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_CSVM +])# FLM_PROG_TRY_CSVM diff --git a/xflaim/m4/ac_prog_try_doxygen.m4 b/xflaim/m4/flm_prog_try_doxygen.m4 similarity index 86% rename from xflaim/m4/ac_prog_try_doxygen.m4 rename to xflaim/m4/flm_prog_try_doxygen.m4 index 06b39ab..5283cc0 100644 --- a/xflaim/m4/ac_prog_try_doxygen.m4 +++ b/xflaim/m4/flm_prog_try_doxygen.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_DOXYGEN(["quiet"]) +# FLM_PROG_TRY_DOXYGEN(["quiet"]) # ------------------------------ -# AC_PROG_TRY_DOXYGEN tests for an existing doxygen source +# FLM_PROG_TRY_DOXYGEN tests for an existing doxygen source # documentation program. It sets or uses the environment # variable DOXYGEN. # @@ -19,7 +19,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_DOXYGEN], +AC_DEFUN([FLM_PROG_TRY_DOXYGEN], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT]) @@ -27,4 +27,4 @@ ifelse([$1],, [if test -z "$DOXYGEN"; then AC_MSG_WARN([Doxygen program not found - continuing without Doxygen]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_DOXYGEN +])# FLM_PROG_TRY_DOXYGEN diff --git a/xflaim/m4/ac_prog_try_jar.m4 b/xflaim/m4/flm_prog_try_jar.m4 similarity index 86% rename from xflaim/m4/ac_prog_try_jar.m4 rename to xflaim/m4/flm_prog_try_jar.m4 index 78520c2..8c9bd98 100644 --- a/xflaim/m4/ac_prog_try_jar.m4 +++ b/xflaim/m4/flm_prog_try_jar.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_JAR(["quiet"]) +# FLM_PROG_TRY_JAR(["quiet"]) # -------------------------- -# AC_PROG_TRY_JAR tests for an existing Java ARchive program.i +# FLM_PROG_TRY_JAR tests for an existing Java ARchive program.i # It sets or uses the environment variable JAR. # # If no arguments are given to this macro, and no Java jar @@ -18,7 +18,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_JAR], +AC_DEFUN([FLM_PROG_TRY_JAR], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([JAR], [Java archive utility])dnl AC_CHECK_PROGS([JAR], [fastjar$EXEEXT jar$EXEEXT]) @@ -26,4 +26,4 @@ ifelse([$1],, [if test -z "$JAR"; then AC_MSG_WARN([Java ARchive program not found - continuing without jar]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_JAR +])# FLM_PROG_TRY_JAR diff --git a/xflaim/m4/ac_prog_try_java.m4 b/xflaim/m4/flm_prog_try_java.m4 similarity index 86% rename from xflaim/m4/ac_prog_try_java.m4 rename to xflaim/m4/flm_prog_try_java.m4 index b211596..d1ccbd4 100644 --- a/xflaim/m4/ac_prog_try_java.m4 +++ b/xflaim/m4/flm_prog_try_java.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_JAVA(["quiet"]) +# FLM_PROG_TRY_JAVA(["quiet"]) # --------------------------- -# AC_PROG_TRY_JAVA test for an existing JAVA virtual machine. +# FLM_PROG_TRY_JAVA test for an existing JAVA virtual machine. # It uses or sets the environment variable JAVA. # # If no arguments are given to this macro, and no java virtual @@ -18,7 +18,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_JAVA], +AC_DEFUN([FLM_PROG_TRY_JAVA], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([JAVA], [Java virtual machine])dnl AC_CHECK_PROGS([JAVA], [kaffe$EXEEXT java$EXEEXT]) @@ -26,4 +26,4 @@ ifelse([$1],, [if test -z "$JAVA"; then AC_MSG_WARN([Java VM not found - continuing without JVM]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_JAVA +])# FLM_PROG_TRY_JAVA diff --git a/xflaim/m4/ac_prog_try_javac.m4 b/xflaim/m4/flm_prog_try_javac.m4 similarity index 86% rename from xflaim/m4/ac_prog_try_javac.m4 rename to xflaim/m4/flm_prog_try_javac.m4 index 57b1fa5..6786cb5 100644 --- a/xflaim/m4/ac_prog_try_javac.m4 +++ b/xflaim/m4/flm_prog_try_javac.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_JAVAC(["quiet"]) +# FLM_PROG_TRY_JAVAC(["quiet"]) # ---------------------------- -# AC_PROG_TRY_JAVAC tests for an existing Java compiler. It uses +# FLM_PROG_TRY_JAVAC tests for an existing Java compiler. It uses # or sets the environment variable JAVAC. # # If no arguments are given to this macro, and no Java @@ -18,7 +18,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_JAVAC], +AC_DEFUN([FLM_PROG_TRY_JAVAC], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([JAVAC], [Java compiler])dnl AC_CHECK_PROGS([JAVAC], ["gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT]) @@ -26,4 +26,4 @@ ifelse([$1],, [if test -z "$JAVAC"; then AC_MSG_WARN([Java compiler not found - continuing without javac]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_JAVAC +])# FLM_PROG_TRY_JAVAC diff --git a/xflaim/m4/ac_prog_try_javadoc.m4 b/xflaim/m4/flm_prog_try_javadoc.m4 similarity index 86% rename from xflaim/m4/ac_prog_try_javadoc.m4 rename to xflaim/m4/flm_prog_try_javadoc.m4 index 9664374..a69acf7 100644 --- a/xflaim/m4/ac_prog_try_javadoc.m4 +++ b/xflaim/m4/flm_prog_try_javadoc.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_JAVADOC(["quiet"]) +# FLM_PROG_TRY_JAVADOC(["quiet"]) # ------------------------------ -# AC_PROG_TRY_JAVADOC tests for an existing javadoc generator. +# FLM_PROG_TRY_JAVADOC tests for an existing javadoc generator. # It uses or sets the environment variable JAVADOC. # # If no arguments are given to this macro, and no javadoc @@ -18,7 +18,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_JAVADOC], +AC_DEFUN([FLM_PROG_TRY_JAVADOC], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([JAVADOC], [Java source documentation utility])dnl AC_CHECK_PROGS([JAVADOC], [gjdoc$EXEEXT javadoc$EXEEXT]) @@ -26,4 +26,4 @@ ifelse([$1],, [if test -z "$JAVADOC"; then AC_MSG_WARN([Javadoc program not found - continuing without javadoc]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_JAVADOC +])# FLM_PROG_TRY_JAVADOC diff --git a/xflaim/m4/ac_prog_try_javah.m4 b/xflaim/m4/flm_prog_try_javah.m4 similarity index 85% rename from xflaim/m4/ac_prog_try_javah.m4 rename to xflaim/m4/flm_prog_try_javah.m4 index 5a22262..fa38979 100644 --- a/xflaim/m4/ac_prog_try_javah.m4 +++ b/xflaim/m4/flm_prog_try_javah.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_JAVAH(["quiet"]) +# FLM_PROG_TRY_JAVAH(["quiet"]) # ---------------------------- -# AC_PROG_TRY_JAVAH tests for an existing Java native header (JNI) +# FLM_PROG_TRY_JAVAH tests for an existing Java native header (JNI) # generator. It uses or sets the environment variable JAVAH. # # If no arguments are given to this macro, and no javah @@ -18,7 +18,7 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_JAVAH], +AC_DEFUN([FLM_PROG_TRY_JAVAH], [AC_REQUIRE([AC_EXEEXT])dnl AC_ARG_VAR([JAVAH], [Java header utility])dnl AC_CHECK_PROGS([JAVAH], [gcjh$EXEEXT javah$EXEEXT]) @@ -26,4 +26,4 @@ ifelse([$1],, [if test -z "$JAVAH"; then AC_MSG_WARN([Java header program not found - continuing without javah]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_JAVAH +])# FLM_PROG_TRY_JAVAH diff --git a/xflaim/m4/ac_prog_try_jni.m4 b/xflaim/m4/flm_prog_try_jni.m4 similarity index 85% rename from xflaim/m4/ac_prog_try_jni.m4 rename to xflaim/m4/flm_prog_try_jni.m4 index facdead..d24547e 100644 --- a/xflaim/m4/ac_prog_try_jni.m4 +++ b/xflaim/m4/flm_prog_try_jni.m4 @@ -1,6 +1,6 @@ -# AC_PROG_TRY_JNI(["quiet"]) +# FLM_PROG_TRY_JNI(["quiet"]) # -------------------------- -# AC_PROG_TRY_JNI tests for the existence of the three +# FLM_PROG_TRY_JNI tests for the existence of the three # tools required to build Java Native Interface (JNI) # modules: javac, javah, and jar. It manages the # environment variable ac_prog_have_jni. @@ -25,11 +25,11 @@ # Modified: 2009-04-27 # License: AllPermissive # -AC_DEFUN([AC_PROG_TRY_JNI], +AC_DEFUN([FLM_PROG_TRY_JNI], [AC_REQUIRE([AC_EXEEXT])dnl -AC_PROG_TRY_JAVAC([quiet])dnl -AC_PROG_TRY_JAVAH([quiet])dnl -AC_PROG_TRY_JAR([quiet])dnl +FLM_PROG_TRY_JAVAC([quiet])dnl +FLM_PROG_TRY_JAVAH([quiet])dnl +FLM_PROG_TRY_JAR([quiet])dnl ifelse([$1],, [ac_prog_have_jni=yes if test -z "$JAVAC"; then ac_prog_have_jni=no; fi @@ -38,4 +38,4 @@ if test -z "$JAR"; then ac_prog_have_jni=no; fi if test "x$ac_prog_have_jni" = xno; then AC_MSG_WARN([Some required JNI tools are missing - continuing without JNI support]) fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])]) -])# AC_PROG_TRY_JNI +])# FLM_PROG_TRY_JNI diff --git a/xflaim/obs/Makefile.am b/xflaim/obs/Makefile.am index 440d67b..d8e5f59 100644 --- a/xflaim/obs/Makefile.am +++ b/xflaim/obs/Makefile.am @@ -1,25 +1,26 @@ rpmspec = $(PACKAGE_TARNAME).spec rpmmacros =\ - --define='_rpmdir $(PWD)/..'\ - --define='_srcrpmdir $(PWD)/..'\ - --define='_sourcedir $(PWD)/..'\ - --define='_specdir $(PWD)/..'\ - --define='_builddir $(PWD)/..' + --define="_rpmdir $${PWD}"\ + --define="_srcrpmdir $${PWD}"\ + --define="_sourcedir $${PWD}/.."\ + --define="_specdir $${PWD}"\ + --define="_builddir $${PWD}" -rpmopts = --nodeps --buildroot='$(PWD)/_rpm' +RPMBUILD = rpmbuild +RPMFLAGS = --nodeps --buildroot="$${PWD}/_rpm" rpmcheck: - @which rpmbuild &> /dev/null; \ - if [ $$? -ne 0 ]; then \ + if [ which rpmbuild &> /dev/null ]; then \ echo "*** This make target requires an rpm-based linux distribution."; \ (exit 1); exit 1; \ fi srcrpm: rpmcheck $(rpmspec) - rpmbuild -bs $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -bs $(rpmmacros) $(rpmspec) rpms: rpmcheck $(rpmspec) - rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) + $(RPMBUILD) $(RPMFLAGS) -ba $(rpmmacros) $(rpmspec) .PHONY: rpmcheck srcrpm rpms + diff --git a/xflaim/src/Makefile.am b/xflaim/src/Makefile.am index 25129b2..1924c39 100644 --- a/xflaim/src/Makefile.am +++ b/xflaim/src/Makefile.am @@ -10,6 +10,9 @@ endif SUBDIRS = $(JAVADIR) $(CSDIR) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libxflaim.pc + lib_LTLIBRARIES = libxflaim.la include_HEADERS = xflaim.h diff --git a/xflaim/src/cs/wrapper/Makefile.am b/xflaim/src/cs/wrapper/Makefile.am index 2a8826d..e5dafc7 100644 --- a/xflaim/src/cs/wrapper/Makefile.am +++ b/xflaim/src/cs/wrapper/Makefile.am @@ -53,8 +53,6 @@ clean-local: rm -f xflaim_csharp.dll xflaim_csharp.xml cstest_script cstest.exe libxflaim.so rm -f Output_Stream rm -rf abc backup test.* - -check-local: cstest.exe cstest_script install-exec-local: test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @@ -78,6 +76,8 @@ xflaim_csharp.dll: $(xfcs_sources) $(CSC) -target:library $(AM_CSCFLAGS) $(CSCFLAGS) -out:$@ -doc:$(@:.dll=.xml) $$list2; \ else :; fi +check_SCRIPTS = cstest.exe cstest_script + cstest.exe: xflaim_csharp.dll $(cstest_sources) @list1='$(cstest_sources)'; list2=; if test -n "$$list1"; then \ for p in $$list1; do \ @@ -88,11 +88,8 @@ cstest.exe: xflaim_csharp.dll $(cstest_sources) $(CSC) $(AM_CSCFLAGS) $(CSCFLAGS) -out:$@ $$list2 -reference:xflaim_csharp.dll; \ else :; fi -libxflaim.so: - $(LN_S) ../../.libs/libxflaim.so libxflaim.so - -cstest_script: cstest.exe libxflaim.so +cstest_script: cstest.exe echo "#!/bin/sh" > cstest_script - echo "$(CSVM) cstest.exe" >> cstest_script + echo "$(top_builddir)/libtool --mode=execute -dlopen ../../libxflaim.la $(CSVM) cstest.exe" >> cstest_script chmod 0755 cstest_script diff --git a/xflaim/src/java/wrapper/Makefile.am b/xflaim/src/java/wrapper/Makefile.am index ff47de9..85f1499 100644 --- a/xflaim/src/java/wrapper/Makefile.am +++ b/xflaim/src/java/wrapper/Makefile.am @@ -10,12 +10,10 @@ $(jarfile): $(dist_noinst_JAVA) jar_DATA = $(jarfile) -java-headers.stamp: $(dist_noinst_JAVA) - @list="`echo $(dist_noinst_JAVA) | sed -e 's|\.java||g' -e 's|/|.|g'`"; \ - for class in $$list; do \ - echo "$(JAVAH) -cp . -jni -d $(jhdrout) $(JAVAHFLAGS) $$class"; \ - $(JAVAH) -cp . -jni -d $(jhdrout) $(JAVAHFLAGS) $$class; \ - done +java-headers.stamp: $(classdist_noinst.stamp) + @list=`echo $(dist_noinst_JAVA) | sed -e 's|\.java||g' -e 's|/|.|g'`; \ + echo "$(JAVAH) -cp . -jni -d $(jhdrout) $(JAVAHFLAGS) $$list"; \ + $(JAVAH) -cp . -jni -d $(jhdrout) $(JAVAHFLAGS) $$list @echo "JNI headers generated" > java-headers.stamp all-local: java-headers.stamp diff --git a/xflaim/libxflaim.pc.in b/xflaim/src/libxflaim.pc.in similarity index 100% rename from xflaim/libxflaim.pc.in rename to xflaim/src/libxflaim.pc.in