updated build system
This commit is contained in:
		
							
								
								
									
										19
									
								
								bootstrap.sh
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								bootstrap.sh
									
									
									
									
									
								
							@@ -120,7 +120,7 @@ GENERATED FILES
 | 
			
		||||
    * src/version.hxx - if you enabled AX_USE_CXX
 | 
			
		||||
    * src/version.cxx - if you enabled AX_USE_CXX
 | 
			
		||||
    * html/makefile.am - if you enabled AX_BUILD_HTML
 | 
			
		||||
    * scripts/makefile.in - if you enabled AX_USE_SCRIPTS
 | 
			
		||||
    * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
 | 
			
		||||
    * doc/makefile.am - if you enabled AX_USE_DOXYGEN
 | 
			
		||||
    * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
 | 
			
		||||
    * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
 | 
			
		||||
@@ -332,7 +332,7 @@ to() {
 | 
			
		||||
        case "$1" in
 | 
			
		||||
            (--condition) shift # test for a tag, abort if not set
 | 
			
		||||
                if ! testtag "$1"; then
 | 
			
		||||
                    return
 | 
			
		||||
                    return 0
 | 
			
		||||
                fi;;
 | 
			
		||||
            (--mode) shift # test for a tag, abort if not set
 | 
			
		||||
                mode="$1";;
 | 
			
		||||
@@ -427,8 +427,7 @@ ${DEFAULT_PROJECT_NAME}
 | 
			
		||||
 | 
			
		||||
add description for ${DEFAULT_PROJECT_NAME}
 | 
			
		||||
EOF
 | 
			
		||||
to configure.ac <<EOF && \
 | 
			
		||||
    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
 | 
			
		||||
to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
 | 
			
		||||
${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
 | 
			
		||||
m4_define(x_major, 0) # project's major version
 | 
			
		||||
m4_define(x_minor, 0) # project's minor version
 | 
			
		||||
@@ -700,7 +699,11 @@ namespace NAMESPACE {
 | 
			
		||||
  const std::string IDENT("\$Id: " PACKAGE_STRING);
 | 
			
		||||
}
 | 
			
		||||
EOF
 | 
			
		||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
 | 
			
		||||
to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
 | 
			
		||||
${HEADER}dist_bin_SCRIPTS =
 | 
			
		||||
 | 
			
		||||
MAINTAINERCLEANFILES = makefile.in
 | 
			
		||||
EOF
 | 
			
		||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 | 
			
		||||
to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 | 
			
		||||
${HEADER}$(if testtag AX_USE_CXX; then
 | 
			
		||||
@@ -824,7 +827,7 @@ EOF
 | 
			
		||||
Source: @PACKAGE_NAME@
 | 
			
		||||
Priority: extra
 | 
			
		||||
Maintainer: @AUTHOR@
 | 
			
		||||
Build-Depends: ${BUILD-DEPENDS}
 | 
			
		||||
Build-Depends: ${BUILD_DEPENDS}
 | 
			
		||||
 | 
			
		||||
Package: @PACKAGE_NAME@
 | 
			
		||||
Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
 | 
			
		||||
@@ -838,7 +841,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 | 
			
		||||
Package: @PACKAGE_NAME@-dev
 | 
			
		||||
Section: libdevel
 | 
			
		||||
Architecture: any
 | 
			
		||||
Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
 | 
			
		||||
Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
 | 
			
		||||
Description: @DESCRIPTION@ - Development Package
 | 
			
		||||
@README_DEB@
 | 
			
		||||
EOF2
 | 
			
		||||
@@ -1002,7 +1005,7 @@ if testtag AX_BUILD_HTML; then
 | 
			
		||||
    SUBDIRS="${SUBDIRS} html"
 | 
			
		||||
fi
 | 
			
		||||
for d in src test scripts doc examples html; do
 | 
			
		||||
    if test -d $d -a "${SUBDIRS//$d/}" = ${SUBDIRS}; then
 | 
			
		||||
    if test -d "$d" -a "${SUBDIRS//$d/}" = "${SUBDIRS}"; then
 | 
			
		||||
        SUBDIRS="${SUBDIRS} $d"
 | 
			
		||||
    fi
 | 
			
		||||
done
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							@@ -1,7 +1,7 @@
 | 
			
		||||
Source: @PACKAGE_NAME@
 | 
			
		||||
Priority: extra
 | 
			
		||||
Maintainer: @AUTHOR@
 | 
			
		||||
Build-Depends: DEPENDS
 | 
			
		||||
Build-Depends: debhelper, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen
 | 
			
		||||
 | 
			
		||||
Package: @PACKAGE_NAME@
 | 
			
		||||
Section: 
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							@@ -2,7 +2,7 @@
 | 
			
		||||
##
 | 
			
		||||
## This file has been added:
 | 
			
		||||
##  - by bootstrap.sh
 | 
			
		||||
##  -  on Thu, 05 November 2015 11:15:18 +0100
 | 
			
		||||
##  -  on Thu, 05 November 2015 13:54:20 +0100
 | 
			
		||||
## Feel free to change it or even remove and rebuild it, up to your needs
 | 
			
		||||
##
 | 
			
		||||
##       1         2         3         4         5         6         7         8
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user