svn commit: r198122 - in user/des/svnsup: . src src/apply
src/distill
Dag-Erling Smorgrav
des at FreeBSD.org
Thu Oct 15 10:48:45 UTC 2009
Author: des
Date: Thu Oct 15 10:48:45 2009
New Revision: 198122
URL: http://svn.freebsd.org/changeset/base/198122
Log:
Connect libsvnsup to the build.
Modified:
user/des/svnsup/configure.ac
user/des/svnsup/src/Makefile.am
user/des/svnsup/src/apply/Makefile.am
user/des/svnsup/src/distill/Makefile.am
Modified: user/des/svnsup/configure.ac
==============================================================================
--- user/des/svnsup/configure.ac Thu Oct 15 10:48:19 2009 (r198121)
+++ user/des/svnsup/configure.ac Thu Oct 15 10:48:45 2009 (r198122)
@@ -15,6 +15,7 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_PROG_RANLIB
AC_ARG_ENABLE(distill,
AS_HELP_STRING([--enable-distill],
@@ -124,6 +125,7 @@ AS_IF([test x"$enable_distill" = x"yes"]
AC_CONFIG_FILES([
Makefile
src/Makefile
+ src/libsvnsup/Makefile
src/distill/Makefile
src/apply/Makefile
])
Modified: user/des/svnsup/src/Makefile.am
==============================================================================
--- user/des/svnsup/src/Makefile.am Thu Oct 15 10:48:19 2009 (r198121)
+++ user/des/svnsup/src/Makefile.am Thu Oct 15 10:48:45 2009 (r198122)
@@ -8,4 +8,4 @@ if ENABLE_APPLY
APPLY_SUBDIR = apply
endif
-SUBDIRS = ${DISTILL_SUBDIR} ${APPLY_SUBDIR}
+SUBDIRS = libsvnsup ${DISTILL_SUBDIR} ${APPLY_SUBDIR}
Modified: user/des/svnsup/src/apply/Makefile.am
==============================================================================
--- user/des/svnsup/src/apply/Makefile.am Thu Oct 15 10:48:19 2009 (r198121)
+++ user/des/svnsup/src/apply/Makefile.am Thu Oct 15 10:48:45 2009 (r198122)
@@ -5,4 +5,8 @@ bin_PROGRAMS = svnsup-apply
svnsup_apply_SOURCES = \
main.c
-svnsup_apply_LDADD =
+svnsup_apply_CPPFLAGS = \
+ -I$(top_builddir)/src/libsvnsup
+
+svnsup_apply_LDADD = \
+ $(top_builddir)/src/libsvnsup/libsvnsup.a
Modified: user/des/svnsup/src/distill/Makefile.am
==============================================================================
--- user/des/svnsup/src/distill/Makefile.am Thu Oct 15 10:48:19 2009 (r198121)
+++ user/des/svnsup/src/distill/Makefile.am Thu Oct 15 10:48:45 2009 (r198122)
@@ -15,9 +15,11 @@ svnsup_distill_SOURCES = \
txdelta.c
svnsup_distill_CPPFLAGS = \
+ -I$(top_builddir)/src/libsvnsup \
${APR_1_CFLAGS}
svnsup_distill_LDADD = \
+ $(top_builddir)/src/libsvnsup/libsvnsup.a \
${APR_1_LDADD} \
${SVN_DELTA_1_LIBS} \
${SVN_CLIENT_1_LIBS} \
More information about the svn-src-user
mailing list