mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated build system as per Ralf's suggestions to Chapter 9 in Autotools book.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1108 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-07-28 18:39:19 +00:00
parent 495cca0a7b
commit 62fc7e082f
34 changed files with 222 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flaim/Makefile.am
View File

@@ -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

42
flaim/configure.ac
View File

@@ -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 "

8
flaim/m4/ac_prog_try_doxygen.m4 → flaim/m4/flm_prog_try_doxygen.m4
View File

@@ -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

20
flaim/obs/Makefile.am
View File

@@ -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

3
flaim/src/Makefile.am
View File

@@ -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 \

0
flaim/libflaim.pc.in → flaim/src/libflaim.pc.in
View File

7
ftk/Makefile.am
View File

@@ -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`

41
ftk/configure.ac
View File

@@ -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

8
ftk/m4/ac_prog_try_doxygen.m4 → ftk/m4/flm_prog_try_doxygen.m4
View File

@@ -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

21
ftk/obs/Makefile.am
View File

@@ -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

3
ftk/src/Makefile.am
View File

@@ -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 \

0
ftk/libflaimtk.pc.in → ftk/src/libflaimtk.pc.in
View File

8
sql/Makefile.am
View File

@@ -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

42
sql/configure.ac
View File

@@ -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 "

8
sql/m4/ac_prog_try_doxygen.m4 → sql/m4/flm_prog_try_doxygen.m4
View File

@@ -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

21
sql/obs/Makefile.am
View File

@@ -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

3
sql/src/Makefile.am
View File

@@ -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 \

0
sql/libflaimsql.pc.in → sql/src/libflaimsql.pc.in
View File

8
xflaim/Makefile.am
View File

@@ -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

51
xflaim/configure.ac
View File

@@ -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 "

8
xflaim/m4/ac_prog_try_csc.m4 → xflaim/m4/flm_prog_try_csc.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_csvm.m4 → xflaim/m4/flm_prog_try_csvm.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_doxygen.m4 → xflaim/m4/flm_prog_try_doxygen.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_jar.m4 → xflaim/m4/flm_prog_try_jar.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_java.m4 → xflaim/m4/flm_prog_try_java.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_javac.m4 → xflaim/m4/flm_prog_try_javac.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_javadoc.m4 → xflaim/m4/flm_prog_try_javadoc.m4
View File

@@ -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

8
xflaim/m4/ac_prog_try_javah.m4 → xflaim/m4/flm_prog_try_javah.m4
View File

@@ -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

14
xflaim/m4/ac_prog_try_jni.m4 → xflaim/m4/flm_prog_try_jni.m4
View File

@@ -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

21
xflaim/obs/Makefile.am
View File

@@ -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

3
xflaim/src/Makefile.am
View File

@@ -10,6 +10,9 @@ endif
SUBDIRS = $(JAVADIR) $(CSDIR)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxflaim.pc
lib_LTLIBRARIES = libxflaim.la
include_HEADERS = xflaim.h

11
xflaim/src/cs/wrapper/Makefile.am
View File

@@ -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

10
xflaim/src/java/wrapper/Makefile.am
View File

@@ -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

0
xflaim/libxflaim.pc.in → xflaim/src/libxflaim.pc.in
View File