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