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

Updated build system: removed leading dashes from rm commands that had -f in them. Conditionally configured directories that are conditionally built.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1092 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-04-24 19:47:25 +00:00
parent 79b06014d7
commit b14c9030bb
13 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flaim/Makefile.am
View File

@@ -13,9 +13,9 @@ 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 )
-rm -rf $(distdir)
rm -rf $(distdir)
dist-hook:
-rm -rf `find $(distdir) -name .svn`
rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

8
flaim/configure.ac
View File

@@ -31,7 +31,11 @@ AC_ARG_ENABLE([debug],
[debug="$withval"], [debug=no])
# Automake conditionals
AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x])
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
if test -n "$DOXYGEN"; then
AC_CONFIG_FILES([docs/doxygen/Makefile
docs/doxygen/doxyfile])
fi
# Check for pthreads
ACX_PTHREAD(
@@ -115,8 +119,6 @@ esac
AC_CONFIG_FILES([Makefile
docs/Makefile
docs/doxygen/Makefile
docs/doxygen/doxyfile
obs/flaim.spec
obs/Makefile
sample/Makefile

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

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

2
flaim/util/Makefile.am
View File

@@ -66,4 +66,4 @@ ut_basictest_LDADD = libutil.la ../src/libflaim.la
TESTS = ut_basictest
clean-local:
-rm -rf samplebackup samplerestore.*
rm -rf samplebackup samplerestore.*

4
ftk/Makefile.am
View File

@@ -14,9 +14,9 @@ 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 )
-rm -rf $(distdir)
rm -rf $(distdir)
dist-hook:
-rm -rf `find $(distdir) -name .svn`
rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

6
ftk/configure.ac
View File

@@ -34,6 +34,10 @@ 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
# Check for pthreads
ACX_PTHREAD(
@@ -137,8 +141,6 @@ case $host in
esac
AC_CONFIG_FILES([Makefile
docs/Makefile
docs/doxyfile
obs/Makefile
obs/ftk.spec
src/Makefile

2
ftk/docs/Makefile.am
View File

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

4
sql/Makefile.am
View File

@@ -13,9 +13,9 @@ 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 )
-rm -rf $(distdir)
rm -rf $(distdir)
dist-hook:
-rm -rf `find $(distdir) -name .svn`
rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

4
xflaim/Makefile.am
View File

@@ -13,9 +13,9 @@ 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 )
-rm -rf $(distdir)
rm -rf $(distdir)
dist-hook:
-rm -rf `find $(distdir) -name .svn`
rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

20
xflaim/configure.ac
View File

@@ -37,8 +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
# Check for pthreads
ACX_PTHREAD(
@@ -123,16 +137,10 @@ esac
AC_CONFIG_FILES([Makefile
docs/Makefile
docs/doxygen/Makefile
docs/doxygen/doxyfile
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

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

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

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

@@ -50,9 +50,9 @@ AM_CSCFLAGS = -d:mono -nologo -warn:4 -warnaserror+ -optimize+
all-local: xflaim_csharp.dll
clean-local:
-rm xflaim_csharp.dll xflaim_csharp.xml cstest_script cstest.exe libxflaim.so
-rm Output_Stream
-rm -rf abc backup test.*
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

10
xflaim/util/Makefile.am
View File

@@ -200,8 +200,8 @@ copy-xml-files.stamp:
echo Timestamp > $@
clean-local:
-rm -rf ix2.*
-rm -rf bld.*
-rm -rf tst.bak
-rm -f *.xml
-rm -f copy-xml-files.stamp
rm -rf ix2.*
rm -rf bld.*
rm -rf tst.bak
rm -f *.xml
rm -f copy-xml-files.stamp