libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

add compile dependencies

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-14 09:31:59 +00:00
parent 5e9c2965e8
commit 4d5d1c98db
4 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@@ -1,3 +1,23 @@
2015-03-13 16:30 marc
* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
debian/compat, debian/copyright, debian/dirs,
debian/libpcscxx.doc-base.EX, debian/shlibs.local.ex,
debian/watch.ex: improved bootstrapping
2015-03-12 09:16 marc
* ChangeLog, ax_init_standard_project.m4: bugfix new buildsystem:
makefile.in is in top_srcdir
2015-03-11 16:00 marc
* ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4,
ax_init_standard_project.m4, bootstrap.sh, configure.ac,
debian/changelog.in, doc/doxyfile.in, doc/examples,
doc/makefile.am, examples, m4, makefile.am, src/makefile.am:
completely new, megacool build system step 1
2015-03-05 14:48 marc 2015-03-05 14:48 marc
* debian/control.in: uic is required if qt is used * debian/control.in: uic is required if qt is used

4
ax_init_standard_project.m4
View File

@@ -104,7 +104,8 @@ AC_DEFUN([AX_USE_CXX], [
AC_CONFIG_FILES([src/makefile]) AC_CONFIG_FILES([src/makefile])
AM_CPPFLAGS="-DPACKAGE_VERSION='\"${PACKAGE_VERSION}\"' -DPACKAGE_NAME='\"${PACKAGE_NAME}\"'" AM_CPPFLAGS='-I ${top_srcdir}/src -I ${top_builddir}/src'
AM_LDFLAGS='-L ${top_srcdir}/src -I ${top_builddir}/src'
# Get rid of that stupid -O2 -g opions! # Get rid of that stupid -O2 -g opions!
CXXFLAGS="${CXXFLAGS:-}" CXXFLAGS="${CXXFLAGS:-}"
@@ -138,6 +139,7 @@ AC_DEFUN([AX_USE_CXX], [
AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_LDFLAGS)
]) ])
AC_DEFUN([AX_USE_CPPUNIT], [ AC_DEFUN([AX_USE_CPPUNIT], [

20
bootstrap.sh
View File

@@ -119,10 +119,12 @@ copy() {
doxyreplace() { doxyreplace() {
echo -n "-> doxyfile: configure $1 ..." echo -n "-> doxyfile: configure $1 ..."
if sed -i 's§\(^'"$1"' *=\) *§\1'" $2"'§g' doc/doxyfile.in; then if sed -i 's|\(^'"$1"' *=\) *|\1'" $2"'|g' doc/doxyfile.in; then
echo " success" echo " success"
else else
echo " ignored" echo " error"
echo "**** command: sed -i 's|\(^'"$1"' *=\) *|\1'" $2"'|g' doc/doxyfile.in;"
exit 1
fi fi
} }
@@ -163,10 +165,10 @@ echo "${HEADER}" | to --condition AX_USE_DOXYGEN doc/makefile.am
echo "${HEADER}" | to --condition AX_BUILD_EXAMPLES examples/makefile.am echo "${HEADER}" | to --condition AX_BUILD_EXAMPLES examples/makefile.am
if testtag AX_USE_DOXYGEN && ! test -f doc/doxyfile.in; then if testtag AX_USE_DOXYGEN && ! test -f doc/doxyfile.in; then
run doxygen -g doc/doxyfile.in run doxygen -g doc/doxyfile.in
doxyreplace PROJECT_NAME '"@PACKAGE_NAME@"' doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
doxyreplace PROJECT_NUMBER '"@PACKAGE_VERSION@"' doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
doxyreplace PROJECT_BRIEF '"@DESCRIPTION@"' doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
doxyreplace PROJECT_LOGO '"@PROJECT_LOGO@"' doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
doxyreplace INLINE_INHERITED_MEMB YES doxyreplace INLINE_INHERITED_MEMB YES
doxyreplace MULTILINE_CPP_IS_BRIEF YES doxyreplace MULTILINE_CPP_IS_BRIEF YES
doxyreplace TAB_SIZE 2 doxyreplace TAB_SIZE 2
@@ -267,7 +269,7 @@ usr/include
EOF EOF
fi fi
to debian/rules <<EOF to debian/rules <<EOF
%: ${HEADER}%:
dh $@ dh $@
EOF EOF
echo 7 | to debian/compat echo 7 | to debian/compat
@@ -288,8 +290,8 @@ includedir=${prefix}/include
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Description: @DESCRIPTION@ Description: @DESCRIPTION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -l@PACKAGE_NAME@ Libs: -L${libdir} -l@PACKAGE_NAME@ @LDFLAGS@
Cflags: -I${includedir} Cflags: -I${includedir} @CPPFLAGS@
EOF EOF
#### Cleanup If Makefile Exists #### #### Cleanup If Makefile Exists ####

4
src/libpcscxx.pc.in
View File

@@ -6,6 +6,6 @@ includedir=${prefix}/include
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Description: C++ wrappers around pcsc-lite, cryptoki, openssh Description: C++ wrappers around pcsc-lite, cryptoki, openssh
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lpcscxx Libs: -L${libdir} -lpcscxx @LDFLAGS@
Libs.private: Libs.private:
Cflags: -I${includedir} Cflags: -I${includedir} @CPPFLAGS@