Changeset 696
- Timestamp:
- Nov 17, 2008, 4:44:46 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bin/Makefile.am
r693 r696 29 29 noinst_HEADERS = Parameter.h 30 30 31 LDADD = @top_builddir@/lib/libsvndigest.a $(SVNDIGEST_LIBS)31 LDADD = $(top_builddir)/lib/libsvndigest.a $(SVNDIGEST_LIBS) 32 32 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) 33 33 34 AM_CPPFLAGS = -I @top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)34 AM_CPPFLAGS = -I$(top_srcdir)/lib $(SVNDIGEST_CPPFLAGS) 35 35 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS) 36 36 -
trunk/configure.ac
r693 r696 154 154 155 155 # checking if we build in a subversion WC 156 AC_MSG_CHECKING([if we build from subversion wc]) 156 157 wc_found="no"; 157 158 if (test "$SVNVERSION" != "no" && … … 160 161 wc_found="yes"; 161 162 fi 163 AC_MSG_RESULT([$wc_found]) 162 164 AC_CHECK_FILE("$srcdir/lib/subversion_info.cc",info_found="yes",info_found="no") 163 165 -
trunk/lib/Makefile.am
r693 r696 54 54 55 55 if HAVE_SVN_WC 56 @srcdir@/subversion_info.cc: subversion_info.cc.tmp57 @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \58 @srcdir@/subversion_info.cc56 $(srcdir)/subversion_info.cc: subversion_info.cc.tmp 57 @$(SHELL) $(top_srcdir)/build_support/move-if-change subversion_info.cc.tmp \ 58 $(srcdir)/subversion_info.cc 59 59 60 60 subversion_info.cc.tmp: FORCE … … 63 63 year=`svn info $(top_srcdir)|$(SED) -n 's/.*Date: \(.*\)-..-.*/\1/p'`;\ 64 64 $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \ 65 -e 's/sub_2_svn_year/'$$year'/g' @srcdir@/subversion_info.cc.in >> $@ ;65 -e 's/sub_2_svn_year/'$$year'/g' $(srcdir)/subversion_info.cc.in >> $@ ; 66 66 endif 67 67 -
trunk/test/Makefile.am
r693 r696 42 42 43 43 44 LDADD = @builddir@/libsvndigesttest.a \45 @top_builddir@/lib/libsvndigest.a \44 LDADD = $(builddir)/libsvndigesttest.a \ 45 $(top_builddir)/lib/libsvndigest.a \ 46 46 $(SVNDIGEST_LIBS) 47 47 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) … … 68 68 69 69 # some tests need the test repo to be checked out 70 stats_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a71 copyright_test_DEPENDENCIES = $(toy_project) @top_builddir@/lib/libsvndigest.a70 stats_test_DEPENDENCIES = $(toy_project) $(top_builddir)/lib/libsvndigest.a 71 copyright_test_DEPENDENCIES = $(toy_project) $(top_builddir)/lib/libsvndigest.a 72 72 73 73 $(toy_project):
Note: See TracChangeset
for help on using the changeset viewer.