buildsystem updated
This commit is contained in:
28
ChangeLog
28
ChangeLog
@@ -1,3 +1,31 @@
|
||||
2015-07-22 10:04 marc
|
||||
|
||||
* ax_init_standard_project.m4, configure.ac: mingw/windows-build
|
||||
works
|
||||
|
||||
2015-07-21 08:42 marc
|
||||
|
||||
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
|
||||
configure.ac, debian/control.in, mac-create-app-bundle.sh:
|
||||
pcsclite does not exist on windows
|
||||
|
||||
2015-07-13 16:50 marc
|
||||
|
||||
* configure.ac: libpkcs11-helper-1 is even worse...
|
||||
|
||||
2015-07-13 14:51 marc
|
||||
|
||||
* configure.ac: prefere libpkcs11-helper-1
|
||||
|
||||
2015-07-13 12:29 marc
|
||||
|
||||
* bootstrap.sh, doc, doc/doxyfile.in, doc/makefile.am: updated docu
|
||||
|
||||
2015-07-13 08:39 marc
|
||||
|
||||
* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
|
||||
bootstrap.sh: upgrade to newest bootstrap-build
|
||||
|
||||
2015-06-24 09:26 marc
|
||||
|
||||
* ChangeLog, ax_init_standard_project.m4: even more support for
|
||||
|
@@ -116,7 +116,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
esac
|
||||
AM_CONDITIONAL(MINGW, test "$MINGW" = "yes")
|
||||
AM_CONDITIONAL(MAC, test "$MAC" = "yes")
|
||||
|
||||
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'"
|
||||
AX_SUBST(NUMBERS)
|
||||
AX_SUBST(HOME)
|
||||
@@ -198,7 +197,6 @@ AC_DEFUN([AX_USE_CXX], [
|
||||
AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
|
||||
AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
|
||||
|
||||
|
||||
AC_SUBST(AM_CXXFLAGS)
|
||||
AC_SUBST(AM_CPPFLAGS)
|
||||
AC_SUBST(AM_LDFLAGS)
|
||||
|
99
bootstrap.sh
99
bootstrap.sh
@@ -122,6 +122,7 @@ GENERATED FILES
|
||||
* debian/${DEFAULT_PROJECT_NAME}-dev.dirs - if you enabled AX_USE_DEBIAN_PACKAGING
|
||||
* debian/rules - if you enabled AX_USE_DEBIAN_PACKAGING
|
||||
* debian/compat - if you enabled AX_USE_DEBIAN_PACKAGING
|
||||
* ${DEFAULT_PROJECT_NAME}.spec.in - if you enable AX_USE_RPM_PACKAGING
|
||||
* src/${DEFAULT_PROJECT_NAME}.pc.in - if you enabled AX_USE_LIBTOOL
|
||||
|
||||
REBUILDING FILES
|
||||
@@ -166,6 +167,8 @@ FILE DEPENDENCIES
|
||||
* debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL
|
||||
* debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL
|
||||
* debian/${DEFAULT_PROJECT_NAME}-dev.dirs depends on AX_USE_LIBTOOL
|
||||
* ${DEFAULT_PROJECT_NAME}.spec.in dependson AX_USE_RPM_PACKAGING,
|
||||
AX_USE_LIBTOOL, AX_CXX_CHECK_QT, AX_CXX_QT, AX_USE_CPPUNIT
|
||||
|
||||
FILES
|
||||
|
||||
@@ -192,7 +195,7 @@ FILES
|
||||
* Enable Scripts: AX_USE_SCRIPTS
|
||||
* Enable Doxygen documentation generation: AX_USE_DOXYGEN
|
||||
* Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
|
||||
* Not yet implemented: AX_USE_RPM_PACKAGING
|
||||
* Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING
|
||||
* Enable C++ testing using CppUnit: AX_USE_CPPUNIT
|
||||
* Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES
|
||||
* Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4)
|
||||
@@ -298,7 +301,7 @@ to() {
|
||||
mode="u=rw,g=rw,o=r"
|
||||
case "$1" in
|
||||
(--condition) shift # test for a tag, abort if not set
|
||||
if ! testtag "$1" configure.ac; then
|
||||
if ! testtag "$1"; then
|
||||
return
|
||||
fi;;
|
||||
(--mode) shift # test for a tag, abort if not set
|
||||
@@ -676,7 +679,7 @@ EOF
|
||||
Source: @PACKAGE_NAME@
|
||||
Priority: extra
|
||||
Maintainer: @AUTHOR@
|
||||
Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi)
|
||||
Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi)
|
||||
|
||||
Package: @PACKAGE_NAME@
|
||||
Section: $(if testtag AX_USE_LIBTOOL; then echo "libs"; fi)
|
||||
@@ -717,6 +720,96 @@ ${HEADER}%:
|
||||
EOF
|
||||
echo 7 | to debian/compat
|
||||
fi
|
||||
to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME} <<EOF
|
||||
Summary: @DESCRIPTION@
|
||||
Name: @PACKAGE_NAME@
|
||||
Version: @VERSION@
|
||||
Release: 1
|
||||
License: LGPL
|
||||
Group: $(if testtag AX_USE_LIBTOOL; then
|
||||
echo Development/Libraries/C++;
|
||||
else
|
||||
echo Applications/...;
|
||||
fi)
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
BuildRequires: pkg-config, subversion, autotools-devel, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
$(if testtag AX_USE_CPPUNIT; then
|
||||
cat <<EOF2
|
||||
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
|
||||
BuildRequires: cppunit-devel
|
||||
%else%if 0%{?suse_version} || 0%{?sles_version}
|
||||
BuildRequires: libcppunit-devel
|
||||
%endif%endif
|
||||
EOF2
|
||||
fi)
|
||||
|
||||
%description
|
||||
@README@
|
||||
$(if testtag AX_USE_LIBTOOL; then
|
||||
echo
|
||||
echo This package contains only the shared libraries required at runtime.
|
||||
fi)
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
./configure --prefix=/usr \
|
||||
--docdir=/usr/share/doc/packages/@PACKAGE_NAME@ \
|
||||
--libdir=/usr/%_lib
|
||||
|
||||
%build
|
||||
make
|
||||
|
||||
%install
|
||||
DESTDIR=\$RPM_BUILD_ROOT make install
|
||||
|
||||
%clean
|
||||
rm -rf \$RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
/usr/bin/*
|
||||
$(if testtag AX_USE_LIBTOOL; then
|
||||
echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
|
||||
fi)
|
||||
%doc
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/README
|
||||
|
||||
$(if testtag AX_USE_LIBTOOL; then
|
||||
cat <<EOF2
|
||||
%package devel
|
||||
Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki (development files)
|
||||
Group: Development/Libraries/C++
|
||||
Requires: @PACKAGE_NAME@ = @VERSION@
|
||||
|
||||
%description devel
|
||||
@README@
|
||||
|
||||
This Package contains all files required for developement.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
/usr/%_lib/@PACKAGE_NAME@.so
|
||||
/usr/%_lib/@PACKAGE_NAME@.a
|
||||
/usr/%_lib/pkgconfig
|
||||
/usr/%_lib/@PACKAGE_NAME@.la
|
||||
/usr/include/
|
||||
/usr/share/pkgconfig
|
||||
%doc
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/html
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/@PACKAGE_NAME@.spec
|
||||
EOF2
|
||||
fi)
|
||||
|
||||
%changelog
|
||||
|
||||
EOF
|
||||
SUBDIRS=""
|
||||
for d in src test scripts doc examples html; do
|
||||
test -d $d && SUBDIRS="${SUBDIRS} $d"
|
||||
|
66
libpcscxx
Normal file
66
libpcscxx
Normal file
@@ -0,0 +1,66 @@
|
||||
Summary: @DESCRIPTION@
|
||||
Name: @PACKAGE_NAME@
|
||||
Version: @VERSION@
|
||||
Release: 1
|
||||
License: LGPL
|
||||
Group: Development/Libraries/C++
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
BuildRequires: pkg-config, subversion, autotools-devel, lsb-release , doxygen, graphviz, mscgen
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
|
||||
%description
|
||||
@README@
|
||||
|
||||
This package contains only the shared libraries required at runtime.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
./configure --prefix=/usr --docdir=/usr/share/doc/packages/@PACKAGE_NAME@ --libdir=/usr/%_lib
|
||||
|
||||
%build
|
||||
make
|
||||
|
||||
%install
|
||||
DESTDIR=$RPM_BUILD_ROOT make install
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
/usr/bin/*
|
||||
/usr/%_lib/@PACKAGE_NAME@.so.*
|
||||
%doc
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/README
|
||||
|
||||
%package devel
|
||||
Summary: C++ Wrapper around OpenSSL, PCSC and Cryptoki (development files)
|
||||
Group: Development/Libraries/C++
|
||||
Requires: @PACKAGE_NAME@ = @VERSION@
|
||||
|
||||
%description devel
|
||||
@README@
|
||||
|
||||
This Package contains all files required for developement.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
/usr/%_lib/@PACKAGE_NAME@.so
|
||||
/usr/%_lib/@PACKAGE_NAME@.a
|
||||
/usr/%_lib/pkgconfig
|
||||
/usr/%_lib/@PACKAGE_NAME@.la
|
||||
/usr/include/
|
||||
/usr/share/pkgconfig
|
||||
%doc
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/html
|
||||
/usr/share/doc/packages/@PACKAGE_NAME@/@PACKAGE_NAME@.spec
|
||||
|
||||
%changelog
|
||||
|
Reference in New Issue
Block a user