- Timestamp:
- Jul 4, 2008, 1:28:06 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bin/Makefile.am
r640 r668 5 5 # Copyright (C) 2005 Jari Häkkinen 6 6 # Copyright (C) 2006 Jari Häkkinen, Peter Johansson 7 # Copyright (C) 2007, 2008 Peter Johansson 7 # Copyright (C) 2007 Peter Johansson 8 # Copyright (C) 2008 Jari Häkkinen, Peter Johansson 8 9 # 9 10 # This file is part of svndigest, http://trac.thep.lu.se/svndigest … … 30 31 noinst_HEADERS = Parameter.h 31 32 32 LDADD = @top_builddir@/lib/libsvndigest. la $(SVNDIGEST_LIBS)33 AM_LDFLAGS = $(S TATICFLAG) $(SVNDIGEST_LDFLAGS)33 LDADD = @top_builddir@/lib/libsvndigest.a $(SVNDIGEST_LIBS) 34 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) 34 35 35 36 AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS) -
trunk/configure.ac
r641 r668 72 72 AC_PROG_CXX 73 73 AC_PROG_INSTALL 74 AC_PROG_ LIBTOOL74 AC_PROG_RANLIB 75 75 AC_PROG_SED 76 76 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok]) … … 92 92 [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"], 93 93 [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"]) 94 95 # optionally prepare for building static libraries.96 AC_ARG_ENABLE(staticbin,97 [AS_HELP_STRING([--enable-staticbin], [create a static binary,98 at least as static as the available underlying libraries99 allows])])100 if test "$enable_staticbin" = "yes"; then101 case $host in102 *-apple-darwin*)103 # At the time of creating this libsvn_subr uses104 # Keychain on Mac OSX. In consequence the below105 # frameworks are needed for succesful static builds.106 SD_LIBS="$SD_LIBS -framework Security"107 SD_LIBS="$SD_LIBS -framework CoreFoundation"108 SD_LIBS="$SD_LIBS -framework CoreServices"109 ;;110 esac111 STATICFLAG=-static112 AC_SUBST(STATICFLAG)113 fi114 94 115 95 # Apache Portable Runtime (APR) API checks … … 147 127 AC_CHECK_HEADER([apr_allocator.h],,apr_found="no") 148 128 AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no") 149 # The library checks below may match shared libs even when150 # --enable-staticbin is given to configure. This should probably not151 # pose any problems since in a properly installed system the shared152 # and static libraries should be the same.153 129 AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1], 154 130 [SD_LIBS="-lsvn_subr-1 $SD_LIBS"],svn_found="no") … … 300 276 fi 301 277 302 if test "$enable_staticbin" = "yes"; then303 AC_MSG_NOTICE([A statically linked 'svndigest' binary will be created.])304 else305 AC_MSG_NOTICE([A dynamically linked 'svndigest' binary will be created.])306 fi307 AC_MSG_NOTICE([])308 309 278 AC_MSG_NOTICE([Now type 'make ; make check'.]) 310 -
trunk/lib/Makefile.am
r667 r668 28 28 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS) 29 29 30 noinst_lib_LTLIBRARIES = libsvndigest.la 31 noinst_libdir = /tmp 30 noinst_LIBRARIES = libsvndigest.a 32 31 33 32 noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h ColumnStream.h \ … … 39 38 SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h 40 39 41 libsvndigest_ la_SOURCES = AddStats.cc Alias.cc BlameStats.cc \40 libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \ 42 41 ClassicStats.cc ColumnStream.cc \ 43 42 Commitment.cc Configuration.cc \ … … 45 44 Functor.cc Gnuplot.cc GnuplotFE.cc HtmlBuf.cc HtmlStream.cc \ 46 45 html_utility.cc LineTypeParser.cc Node.cc \ 47 rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc 46 rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \ 48 47 SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc Trac.cc utility.cc 49 48 -
trunk/test/Makefile.am
r640 r668 3 3 ## $Id$ 4 4 5 # Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson 6 # Copyright (C) 2008 Peter Johansson 5 # Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson 7 6 # 8 7 # This file is part of svndigest, http://trac.thep.lu.se/svndigest … … 42 41 noinst_HEADERS = Suite.h 43 42 44 check_L TLIBRARIES = libsvndigesttest.la43 check_LIBRARIES = libsvndigesttest.a 45 44 46 45 47 LDADD = @builddir@/libsvndigesttest. la \48 @top_builddir@/lib/libsvndigest. la \46 LDADD = @builddir@/libsvndigesttest.a \ 47 @top_builddir@/lib/libsvndigest.a \ 49 48 $(SVNDIGEST_LIBS) 50 AM_LDFLAGS = $(S TATICFLAG) $(SVNDIGEST_LDFLAGS)49 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) 51 50 52 51 AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS) 53 52 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS) 54 53 55 libsvndigesttest_ la_SOURCES = Suite.cc54 libsvndigesttest_a_SOURCES = Suite.cc 56 55 57 56 config_test_SOURCES = config_test.cc … … 71 70 72 71 # some tests need the test repo to be checked out 73 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest. la74 copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest. la72 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a 73 copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a 75 74 76 @top_builddir@/lib/libsvndigest. la:75 @top_builddir@/lib/libsvndigest.a: 77 76 @cd @top_builddir@/lib/ && $(MAKE) $(AM_MAKEFLAGS); 78 77 … … 84 83 rm -rf *.png *.tmp *~ $(targetdir) 85 84 86 .PHONY: @top_builddir@/lib/libsvndigest. la85 .PHONY: @top_builddir@/lib/libsvndigest.a
Note: See TracChangeset
for help on using the changeset viewer.