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

Minor cleanup to configure script and Makefile.am files.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1082 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-04-15 03:43:33 +00:00
parent 67322ee9db
commit 449ece5a33
30 changed files with 62 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -13,4 +13,3 @@ dist-hook:
-rm -rf `find $(distdir) -name .svn`
.PHONY: rpms srcrpm

1
configure.ac
View File

@@ -11,4 +11,3 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SUBDIRS([ftk flaim sql xflaim])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

1
flaim/Makefile.am
View File

@@ -16,4 +16,3 @@ dist-hook:
-rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

27
flaim/configure.ac
View File

@@ -32,10 +32,10 @@ AC_ARG_ENABLE([debug],
# Check for doxygen program.
if test -z "$DOXYGEN"; then
echo "-----------------------------------------"
echo " No Doxygen program found - continuing"
echo " without Doxygen documentation support."
echo "-----------------------------------------"
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD
echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
fi
AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x])
@@ -59,6 +59,14 @@ AC_C_INLINE
# Checks for library functions.
AC_CHECK_FUNCS([atexit strchr])
# 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
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
# Personally, I believe -O2 does as good a job as
@@ -80,16 +88,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls
# CXXFLAGS="$CXXFLAGS $gcc_opt_flags"
#fi
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
# Configure global pre-processor definitions.
AC_SYS_LARGEFILE
# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files])
# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files])
# Configure supported platforms' compiler and linker flags.
case $host in
sparc-*-solaris*)
@@ -142,4 +140,3 @@ echo "
FTK Include....: ${FTKINC:-INSTALLED}
Doxygen........: ${DOXYGEN:-NONE}
"

1
flaim/docs/Makefile.am
View File

@@ -10,4 +10,3 @@ doc_DATA =\
FLAIMArchitecture.odg\
FLAIMArchitecture.png\
introduction_to_flaim_4.doc

1
flaim/docs/doxygen/Makefile.am
View File

@@ -13,4 +13,3 @@ CLEANFILES = doxywarn.txt doxygen.stamp $(docpkg)
clean-local:
-rm -rf html

1
flaim/sample/Makefile.am
View File

@@ -6,4 +6,3 @@ FLAIM_LIB=../src/libflaim.la
sample_SOURCES = sample.cpp
sample_CPPFLAGS = $(FLAIM_INC) $(FTK_INCLUDE)
sample_LDADD = $(FLAIM_LIB)

1
flaim/src/Makefile.am
View File

@@ -119,4 +119,3 @@ libflaim_la_SOURCES = \
libflaim_la_CPPFLAGS = $(FTK_INCLUDE)
libflaim_la_LIBADD = $(FTK_LTLIB)
libflaim_la_LDFLAGS = -version-info 5:2:0

1
ftk/Makefile.am
View File

@@ -20,4 +20,3 @@ dist-hook:
-rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

26
ftk/configure.ac
View File

@@ -34,10 +34,10 @@ AC_ARG_ENABLE([openssl],
# Check for doxygen program.
if test -z "$DOXYGEN"; then
echo "-----------------------------------------"
echo " No Doxygen program found - continuing"
echo " without Doxygen documentation support."
echo "-----------------------------------------"
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD
echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
fi
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
@@ -83,6 +83,14 @@ 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
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
# Personally, I believe -O2 does as good a job as
@@ -104,16 +112,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls
# CXXFLAGS="$CXXFLAGS $gcc_opt_flags"
#fi
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
# Configure global pre-processor definitions.
AC_SYS_LARGEFILE
# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files])
# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files])
# Configure supported platforms' compiler and linker flags.
case $host in
sparc-*-solaris*)

1
ftk/docs/Makefile.am
View File

@@ -13,4 +13,3 @@ CLEANFILES = doxywarn.txt doxygen.stamp $(docpkg)
clean-local:
-rm -rf html

1
ftk/obs/Makefile.am
View File

@@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec)
rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec)
.PHONY: rpmcheck srcrpm rpms

1
ftk/src/Makefile.am
View File

@@ -42,4 +42,3 @@ libflaimtk_la_SOURCES = \
ftkxml.cpp
libflaimtk_la_LDFLAGS = -version-info 0:0:0

5
ftk/util/Makefile.am
View File

@@ -1,5 +1,5 @@
FTKINC=-I$(top_srcdir)/src
FTKLIB=../src/libflaimtk.la
FTKINC = -I$(top_srcdir)/src
FTKLIB = ../src/libflaimtk.la
check_PROGRAMS = ftktest
@@ -8,4 +8,3 @@ ftktest_CPPFLAGS = $(FTKINC)
ftktest_LDADD = $(FTKLIB)
TESTS = ftktest

1
sql/Makefile.am
View File

@@ -16,4 +16,3 @@ dist-hook:
-rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

27
sql/configure.ac
View File

@@ -31,10 +31,10 @@ AC_ARG_ENABLE([debug],
# Check for doxygen program.
if test -z "$DOXYGEN"; then
echo "-----------------------------------------"
echo " No Doxygen program found - continuing"
echo " without Doxygen documentation support."
echo "-----------------------------------------"
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD
echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
fi
AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x])
@@ -57,6 +57,14 @@ 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
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
# Personally, I believe -O2 does as good a job as
@@ -78,16 +86,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls
# CXXFLAGS="$CXXFLAGS $gcc_opt_flags"
#fi
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
# Configure global pre-processor definitions.
AC_SYS_LARGEFILE
# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files])
# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files])
# Configure supported platforms' compiler and linker flags.
case $host in
sparc-*-solaris*)
@@ -135,4 +133,3 @@ echo "
FTK Include....: ${FTKINC:-INSTALLED}
Doxygen........: ${DOXYGEN:-NONE}
"

1
sql/obs/Makefile.am
View File

@@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec)
rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec)
.PHONY: rpmcheck srcrpm rpms

1
xflaim/Makefile.am
View File

@@ -16,4 +16,3 @@ dist-hook:
-rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

43
xflaim/configure.ac
View File

@@ -37,28 +37,28 @@ if test -z "$JAVAC"; then have_java=no; fi
if test -z "$JAVAH"; then have_java=no; fi
if test -z "$JAR"; then have_java=no; fi
if test "x$have_java" = xno; then
echo "-----------------------------------------"
echo " Some Java tools not found - continuing"
echo " without XFLAIM JNI support."
echo "-----------------------------------------"
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
echo " Some Java tools not found - continuing" >&AS_MESSAGE_LOG_FD
echo " without XFLAIM JNI support." >&AS_MESSAGE_LOG_FD
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
fi
AM_CONDITIONAL([HAVE_JAVA], [test "x$have_java" = xyes])
# Check for CSharp compiler.
if test -z "$CSC"; then
echo "-----------------------------------------"
echo " No CSharp compiler found - continuing"
echo " without XFLAIM CSHARP support."
echo "-----------------------------------------"
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
echo " No CSharp compiler found - continuing" >&AS_MESSAGE_LOG_FD
echo " without XFLAIM CSHARP support." >&AS_MESSAGE_LOG_FD
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
fi
AM_CONDITIONAL([HAVE_CSHARP], [test -n "$CSC"])
# Check for doxygen program.
if test -z "$DOXYGEN"; then
echo "-----------------------------------------"
echo " No Doxygen program found - continuing"
echo " without Doxygen documentation support."
echo "-----------------------------------------"
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD
echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD
echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD
fi
AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x])
@@ -84,6 +84,14 @@ 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
# Configure compiler and platform flags and options.
# This stuff was in the original makefile...
# Personally, I believe -O2 does as good a job as
@@ -105,16 +113,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls
# CXXFLAGS="$CXXFLAGS $gcc_opt_flags"
#fi
# Configure DEBUG source code, if requested.
if test "x$debug" = xyes; then
AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
fi
# Configure global pre-processor definitions.
AC_SYS_LARGEFILE
# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files])
# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files])
# Configure supported platforms' compiler and linker flags.
case $host in
sparc-*-solaris*)
@@ -176,4 +174,3 @@ echo "
Javadoc Utility: ${JAVADOC:-NONE}
Doxygen........: ${DOXYGEN:-NONE}
"

1
xflaim/docs/Makefile.am
View File

@@ -5,4 +5,3 @@ if HAVE_DOXYGEN
endif
doc_DATA = XFLAIMArchitecture.odg XFLAIMArchitecture.png

1
xflaim/docs/doxygen/Makefile.am
View File

@@ -13,4 +13,3 @@ CLEANFILES = doxywarn.txt doxygen.stamp $(docpkg)
clean-local:
-rm -rf html

1
xflaim/obs/Makefile.am
View File

@@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec)
rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec)
.PHONY: rpmcheck srcrpm rpms

1
xflaim/sample/Makefile.am
View File

@@ -6,4 +6,3 @@ XFLAIM_LIB=../src/libxflaim.la
sample_SOURCES = sample.cpp
sample_CPPFLAGS = $(XFLAIM_INC) $(FTK_INCLUDE)
sample_LDADD = $(XFLAIM_LIB)

1
xflaim/src/Makefile.am
View File

@@ -103,4 +103,3 @@ libxflaim_la_SOURCES = \
libxflaim_la_CPPFLAGS = $(FTK_INCLUDE)
libxflaim_la_LIBADD = $(JNI_LIBADD) $(CSI_LIBADD) $(FTK_LTLIB)
libxflaim_la_LDFLAGS = -version-info 3:2:0

4
xflaim/src/cs/Makefile.am
View File

@@ -1,6 +1,6 @@
SUBDIRS = wrapper
XFLAIM_INCLUDE=-I$(srcdir)/..
XFLAIM_INCLUDE = -I$(srcdir)/..
noinst_LTLIBRARIES = libxfcsi.la
@@ -17,5 +17,3 @@ libxfcsi_la_SOURCES = \
Query.cpp
libxfcsi_la_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)

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

@@ -95,4 +95,3 @@ cstest_script: cstest.exe libxflaim.so
echo "#!/bin/sh" > cstest_script
echo "$(CSVM) cstest.exe" >> cstest_script
chmod 0755 cstest_script

3
xflaim/src/java/Makefile.am
View File

@@ -1,6 +1,6 @@
SUBDIRS = wrapper
XFLAIM_INCLUDE=-I$(srcdir)/..
XFLAIM_INCLUDE = -I$(srcdir)/..
noinst_LTLIBRARIES = libxfjni.la
@@ -21,4 +21,3 @@ libxfjni_la_SOURCES = \
jquery.cpp
libxfjni_la_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE)

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

@@ -92,4 +92,3 @@ dist_noinst_JAVA = \
$(pkgpath)/UTransStats.java \
$(pkgpath)/XFlaimException.java \
$(pkgpath)/XPathAxis.java

1
xflaim/src/java/wrapper/util/Makefile.am
View File

@@ -35,4 +35,3 @@ dist_noinst_JAVA = \
$(pkgpath)/UITools.java \
$(pkgpath)/XEdit.java \
$(pkgpath)/XFileFilter.java

5
xflaim/util/Makefile.am
View File

@@ -1,7 +1,7 @@
EXTRA_DIST = dbdiff.cpp dbdiff.h domedit.cpp diffbackups.cpp xmlfiles
XFLAIM_INCLUDE=-I$(top_srcdir)/src
XFLAIM_LDADD=../src/libxflaim.la
XFLAIM_INCLUDE = -I$(top_srcdir)/src
XFLAIM_LDADD = ../src/libxflaim.la
## Utility Programs
@@ -205,4 +205,3 @@ clean-local:
-rm -rf tst.bak
-rm -f *.xml
-rm -f copy-xml-files.stamp