Revision: 40878
http://brlcad.svn.sourceforge.net/brlcad/?rev=40878&view=rev
Author: starseeker
Date: 2010-09-29 20:48:48 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Er, oops - let's try adding the Makefile.in files
Modified Paths:
--------------
rt^3/trunk/src/other/subversion/CMakeLists.txt
Added Paths:
-----------
rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake
rt^3/trunk/src/other/subversion/other/apr/Makefile.in
rt^3/trunk/src/other/subversion/other/apr-util/Makefile.in
Copied: rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake (from rev 40871,
rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake)
===================================================================
--- rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake
(rev 0)
+++ rt^3/trunk/src/other/subversion/CMake/ThirdParty.cmake 2010-09-29
20:48:48 UTC (rev 40878)
@@ -0,0 +1,142 @@
+#-----------------------------------------------------------------------------
+MACRO(THIRD_PARTY_OPTION upper lower)
+ IF(${CMAKE_PROJECT_NAME}-ENABLE_ALL_LOCAL_LIBS)
+ OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} "Build the
local ${upper} library." ON)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} ON CACHE BOOL
"Build the local ${upper} library." FORCE)
+ ELSE(${CMAKE_PROJECT_NAME}-ENABLE_ALL_LOCAL_LIBS)
+ OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} "Build the
local ${upper} library." OFF)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OFF CACHE BOOL
"Build the local ${upper} library." FORCE)
+ ENDIF(${CMAKE_PROJECT_NAME}-ENABLE_ALL_LOCAL_LIBS)
+ IF(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ SET(${upper}_FOUND "${upper}-NOTFOUND" CACHE STRING
"${upper}_FOUND" FORCE)
+ SET(${upper}_LIBRARY "${upper}-NOTFOUND" CACHE STRING
"${upper}_LIBRARY" FORCE)
+ SET(${upper}_INCLUDE_DIR "${upper}-NOTFOUND" CACHE STRING
"${upper}_INCLUDE_DIR" FORCE)
+ IF(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
+
INCLUDE(${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
+ ELSE(EXISTS
${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
+ ENDIF(EXISTS
${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
+ IF(NOT ${upper}_FOUND)
+ IF(NOT ${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}
ON CACHE BOOL "Build the local ${upper} library." FORCE)
+ SET(${upper}_LIBRARY "${lower}" CACHE STRING
"set by THIRD_PARTY macro" FORCE)
+ ENDIF(NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ ELSE(NOT ${upper}_FOUND)
+ # We have to remove any previously built output from enabled
local copies of the
+ # library in question, or the linker will get confused - a
system lib was found and
+ # system libraries are to be preferred with current options.
This is unfortunate in
+ # that it may introduce extra build work just from trying
configure options, but appears
+ # to be essential to ensuring that the build "just works" each
time.
+ STRING(REGEX REPLACE "lib" "" rootname "${lower}")
+ FILE(GLOB STALE_FILES
"${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${rootname}*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
+ MESSAGE("STALE_FILES: ${STALE_FILES}")
+ FOREACH(stale_file ${STALE_FILES})
+ EXEC_PROGRAM(
+ ${CMAKE_COMMAND} ARGS -E remove ${stale_file}
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ ENDFOREACH(stale_file ${STALE_FILES})
+
+ ENDIF(NOT ${upper}_FOUND)
+ ELSE(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ SET(${upper}_LIBRARY "${lower}" CACHE STRING "set by
THIRD_PARTY macro" FORCE)
+ ENDIF(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ MARK_AS_ADVANCED(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper})
+ENDMACRO(THIRD_PARTY_OPTION)
+
+#-----------------------------------------------------------------------------
+MACRO(THIRD_PARTY_SUBDIR upper lower)
+ IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ ADD_SUBDIRECTORY(${lower})
+ SET(${upper}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${lower}
CACHE STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
+ ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ENDMACRO(THIRD_PARTY_SUBDIR)
+
+#-----------------------------------------------------------------------------
+
+include(ExternalProject)
+
+MACRO(THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT upper projname projpath srcpath
extraopts)
+ MESSAGE("${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}:
${${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}}")
+ IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ MESSAGE("got this far ${projname}")
+ ExternalProject_Add(
+ ${projname}
+ DOWNLOAD_COMMAND ""
+ PREFIX ${${CMAKE_PROJECT_NAME}_BINARY_DIR}
+ SOURCE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
+ CONFIGURE_COMMAND mkdir -p
+ ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && cd
+ ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ &&
+ <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--mandir=${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR} ${extraopts}
+ BUILD_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE)
+ INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
+ )
+ SET(CMAKE_EXTERNAL_TARGET_LIST
"${CMAKE_EXTERNAL_TARGET_LIST};${projname}" CACHE STRING "external target list"
FORCE)
+ ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ENDMACRO(THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT)
+
+MACRO(THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT upper projname projpath srcpath
extraopts)
+ IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ ExternalProject_Add(
+ ${projname}
+ DOWNLOAD_COMMAND ""
+ PREFIX ${${CMAKE_PROJECT_NAME}_BINARY_DIR}
+ SOURCE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
+ CONFIGURE_COMMAND autoconf -I <SOURCE_DIR> -o
+ <SOURCE_DIR>/configure <SOURCE_DIR>/configure.in &&
mkdir -p
+ ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && cd
+ ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ &&
+ <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--mandir=${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR} ${extraopts}
+ BUILD_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE)
+ INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
+ )
+ SET(CMAKE_EXTERNAL_TARGET_LIST
"${CMAKE_EXTERNAL_TARGET_LIST};${projname}" CACHE STRING "external target list"
FORCE)
+ ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ENDMACRO(THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT)
+
+
+MACRO(THIRD_PARTY_AUTORECONF_EXTERNAL_PROJECT upper projname projpath srcpath
extraopts)
+ IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ ExternalProject_Add(
+ ${projname}
+ DOWNLOAD_COMMAND ""
+ PREFIX ${${CMAKE_PROJECT_NAME}_BINARY_DIR}
+ SOURCE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
+ CONFIGURE_COMMAND cd <SOURCE_DIR> && autoreconf -i -f
&& mkdir -p
+ ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && cd
+ ${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ &&
+ <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--mandir=${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR} ${extraopts}
+ BUILD_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE)
+ INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
+ )
+ SET(CMAKE_EXTERNAL_TARGET_LIST
"${CMAKE_EXTERNAL_TARGET_LIST};${projname}" CACHE STRING "external target list"
FORCE)
+ ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ENDMACRO(THIRD_PARTY_AUTORECONF_EXTERNAL_PROJECT)
+
+
+#-----------------------------------------------------------------------------
+MACRO(THIRD_PARTY_WARNING_SUPPRESS upper lang)
+ IF(NOT ${upper}_WARNINGS_ALLOW)
+ # MSVC uses /w to suppress warnings. It also complains if another
+ # warning level is given, so remove it.
+ IF(MSVC)
+ SET(${upper}_WARNINGS_BLOCKED 1)
+ STRING(REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " "
+ CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
+ SET(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /w")
+ ENDIF(MSVC)
+
+ # Borland uses -w- to suppress warnings.
+ IF(BORLAND)
+ SET(${upper}_WARNINGS_BLOCKED 1)
+ SET(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -w-")
+ ENDIF(BORLAND)
+
+ # Most compilers use -w to suppress warnings.
+ IF(NOT ${upper}_WARNINGS_BLOCKED)
+ SET(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -w")
+ ENDIF(NOT ${upper}_WARNINGS_BLOCKED)
+ ENDIF(NOT ${upper}_WARNINGS_ALLOW)
+ENDMACRO(THIRD_PARTY_WARNING_SUPPRESS)
Modified: rt^3/trunk/src/other/subversion/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/other/subversion/CMakeLists.txt 2010-09-29 20:30:53 UTC
(rev 40877)
+++ rt^3/trunk/src/other/subversion/CMakeLists.txt 2010-09-29 20:48:48 UTC
(rev 40878)
@@ -48,10 +48,7 @@
SET(SVN_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share")
FILE(APPEND ${SVN_CONFIG_H_FILE} "#cmakedefine SVN_LOCALE_DIR
\"${SVN_LOCALE_DIR}\"\n")
-# Set man page directory
-SET(SUBVERSION_INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man")
-
FILE(APPEND ${SVN_CONFIG_H_FILE} "#define SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
1\n")
FILE(APPEND ${SVN_CONFIG_H_FILE} "#define SVN_LIBSVN_CLIENT_LINKS_RA_SVN 1\n")
FILE(APPEND ${SVN_CONFIG_H_FILE} "#define SVN_LIBSVN_FS_LINKS_FS_FS 1\n")
@@ -113,37 +110,20 @@
# build static libs by default
OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+INCLUDE(${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/CMake/ThirdParty.cmake)
+
find_package(ZLIB)
find_package(EXPAT)
#find_package(APR)
-INCLUDE(ExternalProject)
IF(NOT APR_LIBRARY)
SET(SUBVERSION_BUILD_LOCAL_APR 1)
- ExternalProject_Add(
- apr
- DOWNLOAD_COMMAND ""
- PREFIX ${SUBVERSION_BINARY_DIR}
- SOURCE_DIR ${SUBVERSION_SOURCE_DIR}/other/apr
- CONFIGURE_COMMAND cd <SOURCE_DIR> &&
- <SOURCE_DIR>/configure --prefix=${CMAKE_INSTALL_PREFIX}
--exec-prefix=${CMAKE_INSTALL_PREFIX}
- BUILD_COMMAND cd <SOURCE_DIR> && $(MAKE)
- INSTALL_COMMAND cd <SOURCE_DIR> && $(MAKE) install
- )
+ THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT(APR apr src/other/apr "" "")
SET(APR_LIBRARY
"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}apr-1${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "APR_LIBRARY")
SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/apr-1" CACHE
STRING "APR_INCLUDE")
ENDIF(NOT APR_LIBRARY)
IF(NOT APU_LIBRARY)
SET(SUBVERSION_BUILD_LOCAL_APU 1)
- ExternalProject_Add(
- apr-util
- DOWNLOAD_COMMAND ""
- PREFIX ${SUBVERSION_BINARY_DIR}
- SOURCE_DIR ${SUBVERSION_SOURCE_DIR}/other/apr-util
- CONFIGURE_COMMAND cd <SOURCE_DIR> &&
- <SOURCE_DIR>/configure --prefix=${CMAKE_INSTALL_PREFIX}
--exec-prefix=${CMAKE_INSTALL_PREFIX}
- BUILD_COMMAND cd <SOURCE_DIR> && $(MAKE)
- INSTALL_COMMAND cd <SOURCE_DIR> && $(MAKE) install
- )
+ THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT(APU apr-util ""
src/other/apr-util "")
SET(APU_LIBRARY
"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}aprutil-1${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "APU_LIBRARY")
SET(APU_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/apr-1" CACHE
STRING "APU_INCLUDE")
ENDIF(NOT APU_LIBRARY)
Added: rt^3/trunk/src/other/subversion/other/apr/Makefile.in
===================================================================
--- rt^3/trunk/src/other/subversion/other/apr/Makefile.in
(rev 0)
+++ rt^3/trunk/src/other/subversion/other/apr/Makefile.in 2010-09-29
20:48:48 UTC (rev 40878)
@@ -0,0 +1,126 @@
+
+srcd...@srcdir@
+vpa...@srcdir@
+top_srcd...@apr_srcdir@
+top_bldd...@apr_builddir@
+
+#
+# APR (Apache Portable Runtime) library Makefile.
+#
+CPP = @CPP@
+
+# get substituted into some targets
+apr_major_versi...@apr_major_version@
+
+#
+# Macros for supporting directories
+#
+INCDIR=./include
+OSDIR=$(top_srcdir)/include/arch/@OSDIR@
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
+
+#
+# Macros for target determination
+#
+CLEAN_SUBDIRS= test
+install_subdi...@install_subdirs@
+
+TARGET_LIB = l...@[email protected]
+APR_PCFILE = apr-$(APR_MAJOR_VERSION).pc
+APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+#
+# Rules for building specific targets, starting with 'all' for
+# building the entire package.
+#
+TARGETS = $(TARGET_LIB) apr.exp apr-config.out build/apr_rules.out
+
+LT_VERSION = @LT_VERSION@
+
+# bring in rules.mk for standard functionality
+...@include_rules@
+...@include_outputs@
+
+CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ build/apr_rules.out
+DISTCLEAN_TARGETS = config.cache config.log config.status \
+ include/apr.h include/arch/unix/apr_private.h \
+ libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
+ build/pkg/pkginfo
+EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \
+ build-outputs.mk build/ltcf-c.sh build/ltmain.sh build/libtool.m4
+
+pref...@prefix@
+exec_pref...@exec_prefix@
+bind...@bindir@
+libd...@libdir@
+included...@includedir@
+installbuildd...@installbuilddir@
+
+# Create apr-config script suitable for the install tree
+apr-config.out: $(APR_CONFIG)
+ sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > $@
+
+# Create apr_rules.mk suitable for the install tree
+build/apr_rules.out: build/apr_rules.mk
+ sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' <
build/apr_rules.mk > $@
+
+install: $(TARGETS)
+ $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
$(DESTDIR)$(installbuilddir) \
+ $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
+ for f in $(top_srcdir)/include/apr_*.h; do \
+ $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
+ done
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB)
$(DESTDIR)$(libdir)
+ $(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
+ $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
+ for f in libtool shlibtool; do \
+ if test -f $${f}; then $(INSTALL) -m 755 $${f}
$(DESTDIR)$(installbuilddir); fi; \
+ done
+ $(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh
$(DESTDIR)$(installbuilddir)
+ for f in make_exports.awk make_var_export.awk; do \
+ $(INSTALL_DATA) $(top_srcdir)/build/$${f}
$(DESTDIR)$(installbuilddir); \
+ done
+ $(INSTALL_DATA) build/apr_rules.out
$(DESTDIR)$(installbuilddir)/apr_rules.mk
+ $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
+ @if [ $(INSTALL_SUBDIRS) != "none" ]; then \
+ for i in $(INSTALL_SUBDIRS); do \
+ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
+ done \
+ fi
+
+$(TARGET_LIB): $(OBJECTS)
+ $(LINK) @lib_target@ $(ALL_LIBS)
+
+exports.c: $(HEADERS)
+ $(APR_MKEXPORT) $(HEADERS) > $@
+
+export_vars.c: $(HEADERS)
+ $(APR_MKVAREXPORT) $(HEADERS) > $@
+
+apr.exp: exports.c export_vars.c
+ @echo "#! l...@[email protected]" > $@
+ @echo "* This file was AUTOGENERATED at build time." >> $@
+ @echo "* Please do not edit by hand." >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" |
sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e
's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+
+dox:
+ doxygen $(top_srcdir)/docs/doxygen.conf
+
+gcov:
+ @build/run-gcov.sh
+
+test: check
+check: $(TARGET_LIB)
+ cd test && $(MAKE) all check
+
+etags:
+ etags `find . -name '*.[ch]'`
+
+# DO NOT REMOVE
+docs: $(INCDIR)/*.h
Property changes on: rt^3/trunk/src/other/subversion/other/apr/Makefile.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: rt^3/trunk/src/other/subversion/other/apr-util/Makefile.in
===================================================================
--- rt^3/trunk/src/other/subversion/other/apr-util/Makefile.in
(rev 0)
+++ rt^3/trunk/src/other/subversion/other/apr-util/Makefile.in 2010-09-29
20:48:48 UTC (rev 40878)
@@ -0,0 +1,121 @@
+#
+# Top-level Makefile for APRUTIL
+#
+CPP = @CPP@
+
+# gets substituted into some targets
+aprutil_major_versi...@aprutil_major_version@
+aprutil_dotted_versi...@aprutil_dotted_version@
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
+APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
+APRUTIL_LIBS = @APRUTIL_LIBS@
+
+TARGET_LIB = l...@[email protected]
+INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
+EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
+APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
+APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+APU_MODULES = @APU_MODULES@
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS)
$(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release
$(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
+APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+
+LT_VERSION = @APU_LTVERSION@
+
+EXTRA_OBJECTS = @EXTRA_OBJECTS@
+
+LDADD_dbd_pgsql = @LDADD_dbd_pgsql@
+LDADD_dbd_oracle = @LDADD_dbd_oracle@
+LDADD_dbd_sqlite2 = @LDADD_dbd_sqlite2@
+LDADD_dbd_sqlite3 = @LDADD_dbd_sqlite3@
+LDADD_dbd_mysql = @LDADD_dbd_mysql@
+LDADD_dbd_freetds = @LDADD_dbd_freetds@
+LDADD_dbd_odbc = @LDADD_dbd_odbc@
+LDADD_dbm_db = @LDADD_dbm_db@
+LDADD_dbm_gdbm = @LDADD_dbm_gdbm@
+LDADD_dbm_ndbm = @LDADD_dbm_ndbm@
+LDADD_ldap = @LDADD_ldap@
+
+TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(APU_MODULES)
+
+# bring in rules.mk for standard functionality
+...@include_rules@
+...@include_outputs@
+
+CLEAN_SUBDIRS = test @APR_ICONV_DIR@ @APR_XML_DIR@
+
+CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
+DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
+ include/private/apu_config.h include/private/apu_private.h \
+ include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
+ export_vars.sh $(APU_CONFIG) build/rules.mk include/apu_want.h \
+ apr-util.pc build/pkg/pkginfo
+EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
+ exports.c build-outputs.mk \
+ build/apr_common.m4 build/find_apr.m4 build/install.sh \
+ build/config.guess build/config.sub
+
+pref...@prefix@
+exec_pref...@exec_prefix@
+bind...@bindir@
+libd...@libdir@
+included...@includedir@
+top_srcd...@abs_srcdir@
+top_bldd...@abs_builddir@
+
+# Create apu-config script suitable for the install tree
+apu-config.out: $(APU_CONFIG)
+ sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
+
+install: $(TARGETS) install-modules
+ $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
+ $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
+ $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
+ done
+ $(INSTALL_DATA) apr-util.pc
$(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
+ list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
+ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
+ done
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB)
$(DESTDIR)$(libdir)
+ $(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
+ $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
+
+$(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS)
+ $(LINK) @lib_target@ $(EXTRA_OBJECTS) $(ALL_LIBS) $(APRUTIL_LDFLAGS)
$(APRUTIL_LIBS)
+
+install-modules: install-modul...@apu_have_modules@
+
+install-modules-no:
+
+install-modules-yes: $(APU_MODULES)
+ $(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
+ @for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS)
--mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
+
+exports.c: $(HEADERS)
+ $(APR_MKEXPORT) $(HEADERS) > $@
+
+export_vars.c: $(HEADERS)
+ $(APR_MKVAREXPORT) $(HEADERS) > $@
+
+aprutil.exp: exports.c export_vars.c
+ @echo "#! l...@[email protected]" > $@
+ @echo "* This file was AUTOGENERATED at build time." >> $@
+ @echo "* Please do not edit by hand." >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" |
sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e
's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+
+dox:
+ doxygen $(top_srcdir)/docs/doxygen.conf
+
+test: check
+check: $(TARGET_LIB)
+ cd test && $(MAKE) all check
+
+.PHONY: install-modules install-modules-yes install-modules-no dox test check
Property changes on: rt^3/trunk/src/other/subversion/other/apr-util/Makefile.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
