Changeset 1028


Ignore:
Timestamp:
04/04/08 22:28:07 (4 years ago)
Author:
alonbl
Message:

New build system

Sync with other projects.

merge -r 1014:1027  https://www.opensc-project.org/svn/openct/branches/alonbl/build

_M .
_M macos
M macos/Makefile.am
M configure.ac
_M doc
D doc/changelog.sh
M doc/doxygen.conf.in
D doc/export-wiki.xsl
M doc/Makefile.am
A doc/opensc-logo.gif
D doc/generate-api.sh
D doc/export-wiki.sh
AM doc/nonpersistent
A doc/nonpersistent/export-wiki.xsl
A doc/nonpersistent/Makefile.am
A doc/nonpersistent/export-wiki.sh
A doc/nonpersistent/svn2cl.xsl
D doc/svn2cl.xsl
A doc/doxygen-footer.html
_M src
_M src/ctapi
M src/ctapi/Makefile.am
_M src/tools
M src/tools/Makefile.am
_M src/ifd
M src/ifd/ifd-cm4000.c
M src/ifd/atr.c
M src/ifd/ifd-pertosmart1030.c
M src/ifd/ifd-pertosmart1038.c
M src/ifd/ifd-rutoken.c
M src/ifd/sys-linux.c
M src/ifd/Makefile.am
_M src/include
_M src/include/openct
M src/include/openct/Makefile.am
M src/include/Makefile.am
_M src/ct
M src/ct/Makefile.am
_M src/pcsc
M src/pcsc/Makefile.am
M src/Makefile.am
M Makefile.am
A svnignore
_M etc
M etc/Makefile.am
_M solaris
_M aclocal
D aclocal/pkg.m4
M aclocal/ac_create_stdint_h.m4
D aclocal/ac_compile_check_sizeof.m4
M aclocal/Makefile.am

Location:
trunk
Files:
7 deleted
36 edited
8 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
        26 archive 
        27 acinclude.m4 
        28 aclocal.m4 
        29 autom4te.cache 
        30 compile 
        31 confdefs.h 
        32 config.cache 
        33 config.guess 
        34 config.h 
        35 config.h.in 
        36 config.log 
        37 config.status 
        38 config.sub 
        39 configure 
        40 conftest 
        41 conftest.c 
        42 depcomp 
        43 install-sh 
        44 libtool 
        45 libtool.m4 
        46 ltmain.sh 
        47 missing 
        48 mkinstalldirs 
        49 so_locations 
        50 stamp-h* 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/Makefile.am

    r806 r1028  
    1 # Process this file with automake to create Makefile.in 
     1AUTOMAKE_OPTIONS = foreign 1.10 
     2ACLOCAL_AMFLAGS = -I aclocal 
    23 
    3 SUBDIRS = . aclocal etc macos src  
    4 DIST_SUBDIRS = . aclocal doc etc macos src  
     4MAINTAINERCLEANFILES = \ 
     5        config.log config.status \ 
     6        $(srcdir)/Makefile.in \ 
     7        $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \ 
     8        $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \ 
     9        $(srcdir)/depcomp $(srcdir)/aclocal.m4 $(srcdir)/compile \ 
     10        $(srcdir)/config.guess $(srcdir)/config.sub \ 
     11        $(srcdir)/packaged 
     12EXTRA_DIST = svnignore 
    513 
    6 EXTRA_DIST = LGPL-2.1 NEWS TODO bootstrap depcomp \ 
     14SUBDIRS = aclocal etc macos src doc 
     15 
     16dist_noinst_SCRIPTS = bootstrap 
     17dist_noinst_DATA = LGPL-2.1 TODO \ 
    718        solaris/Makefile.client solaris/Makefile.server solaris/README \ 
    819        solaris/checkinstall.in solaris/devices-openct-fabric.xml-dist \ 
    … …  
    1021        solaris/openct.conf-dist solaris/pkginfo.in solaris/postinstall \ 
    1122        solaris/preremove solaris/proto 
     23dist_doc_DATA = NEWS 
    1224 
    13 MAINTAINERCLEANFILES = \ 
    14         Makefile.in config.h.in configure \ 
    15         install-sh ltmain.sh missing mkinstalldirs \ 
    16         compile depcomp config.log config.status \ 
    17         config.guess config.sub acinclude.m4 aclocal.m4 
    18  
    19 DEPCLEANFILES = config.log configure 
    20  
    21 AUTOMAKE_OPTIONS = foreign 1.5 
    22 ACLOCAL_AMFLAGS = -I aclocal 
     25# Allow detection of packaged tarball 
     26dist-hook: 
     27        echo > "$(distdir)/packaged" 

  • trunk/aclocal

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/aclocal/Makefile.am

    r769 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
    5 EXTRA_DIST = ac_compile_check_sizeof.m4 ac_create_stdint_h.m4 \ 
    6         acx_pthread.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 pkg.m4 
     3dist_noinst_DATA = ac_create_stdint_h.m4 \ 
     4        acx_pthread.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 

  • trunk/aclocal/ac_create_stdint_h.m4

    r359 r1028  
    1616dnl int_least32_t.. int_fast32_t.. intmax_t 
    1717dnl which may or may not rely on the definitions of other files, 
    18 dnl or using the AC_COMPILE_CHECK_SIZEOF macro to determine the actual 
     18dnl or using the AC_CHECK_SIZEOF macro to determine the actual 
    1919dnl sizeof each type. 
    2020dnl 
    … …  
    3939AC_DEFUN([AC_CREATE_STDINT_H], 
    4040[# ------ AC CREATE STDINT H ------------------------------------- 
     41AC_PROG_MKDIR_P 
     42AC_PROG_SED 
    4143AC_MSG_CHECKING([for stdint-types....]) 
    4244ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` 
    … …  
    9092 
    9193if test "$ac_cv_header_stdint_x" = "no-file" ; then 
    92    AC_COMPILE_CHECK_SIZEOF(char) 
    93    AC_COMPILE_CHECK_SIZEOF(short) 
    94    AC_COMPILE_CHECK_SIZEOF(int) 
    95    AC_COMPILE_CHECK_SIZEOF(long) 
    96    AC_COMPILE_CHECK_SIZEOF(void*) 
     94   AC_CHECK_SIZEOF(char) 
     95   AC_CHECK_SIZEOF(short) 
     96   AC_CHECK_SIZEOF(int) 
     97   AC_CHECK_SIZEOF(long) 
     98   AC_CHECK_SIZEOF(void*) 
    9799   ac_cv_header_stdint_test="yes" 
    98100else 
    … …  
    103105_ac_stdint_h=AS_TR_CPP(_$ac_stdint_h) 
    104106AC_MSG_RESULT(creating $ac_stdint_h : $_ac_stdint_h) 
     107${MKDIR_P} $(echo "${ac_stdint_h}" | ${SED} 's/[[^/]]*$//') 2> /dev/null 
    105108echo "#ifndef" $_ac_stdint_h >$ac_stdint_h 
    106109echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h 

  • trunk/configure.ac

    r1011 r1028  
    11dnl -*- mode: m4; -*- 
    2 dnl Process this file with autoconf to produce a configure script. 
    3  
    4 # Require autoconf 2.52 
    5 AC_PREREQ(2.52) 
    6 AC_INIT([openct], [0.6.14-svn]) 
    7 AM_INIT_AUTOMAKE 
    8 AM_CONFIG_HEADER(config.h) 
    9  
    10 AC_CONFIG_SRCDIR(src/ifd/ifdhandler.c) 
     2 
     3AC_PREREQ([2.60]) 
     4 
     5define([PACKAGE_VERSION_MAJOR], [0]) 
     6define([PACKAGE_VERSION_MINOR], [6]) 
     7define([PACKAGE_VERSION_FIX], [14]) 
     8 
     9AC_INIT([openct], [PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX-svn]) 
     10AC_CONFIG_AUX_DIR([.]) 
     11AM_CONFIG_HEADER([config.h]) 
     12AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}]) 
     13 
     14OPENCT_VERSION_MAJOR="PACKAGE_VERSION_MAJOR" 
     15OPENCT_VERSION_MINOR="PACKAGE_VERSION_MINOR" 
     16OPENCT_VERSION_FIX="PACKAGE_VERSION_FIX" 
    1117 
    1218# LT Version numbers, remember to change them just *before* a release. 
    1319#   (Code changed:                      REVISION++) 
    14 #   (Interfaces added/removed/changed:  CURRENT++, REVISION=0) 
    15 #   (Interfaces added:                  AGE++) 
    16 #   (Interfaces removed:                AGE=0) 
    17 OPENCT_LT_CURRENT=1 
    18 OPENCT_LT_REVISION=0 
    19 OPENCT_LT_AGE=0 
    20  
    21 AC_SUBST(OPENCT_LT_CURRENT) 
    22 AC_SUBST(OPENCT_LT_REVISION) 
    23 AC_SUBST(OPENCT_LT_AGE) 
     20#   (Oldest interface removed:          OLDEST++) 
     21#   (Interfaces added:                  CURRENT++, REVISION=0) 
     22OPENCT_LT_CURRENT="1" 
     23OPENCT_LT_OLDEST="1" 
     24OPENCT_LT_REVISION="0" 
     25OPENCT_LT_AGE="$((${OPENCT_LT_CURRENT}-${OPENCT_LT_OLDEST}))" 
     26 
     27AC_CONFIG_SRCDIR(src/ifd/ifdhandler.c) 
    2428 
    2529AC_CANONICAL_HOST 
    2630AC_PROG_CC 
     31PKG_PROG_PKG_CONFIG 
    2732AC_C_BIGENDIAN 
    2833 
     34AC_MSG_CHECKING([svn checkout]) 
     35if test -e packaged; then 
     36        svn_checkout="no" 
     37else 
     38        svn_checkout="yes" 
     39fi 
     40AC_MSG_RESULT([${svn_checkout}]) 
     41 
    2942dnl Check for some target-specific stuff 
    30 case "$host" in 
    31 *-*-hpux*) 
    32         CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED" 
    33         ;; 
    34 *-*-solaris*) 
    35         CPPFLAGS="$CPPFLAGS -I/usr/sfw/include -I/usr/local/include" 
    36         LDFLAGS="$LDFLAGS -L/usr/sfw/lib -R/usr/sfw/lib -L/usr/local/lib -R/usr/local/lib" 
    37         need_dash_r=1 
    38         ;; 
    39 *-*-sunos4*) 
    40         CPPFLAGS="$CPPFLAGS -DSUNOS4" 
    41         ;; 
    42 *-*-aix*) 
    43         CPPFLAGS="$CPPFLAGS -I/usr/local/include" 
    44         LDFLAGS="$LDFLAGS -L/usr/local/lib" 
    45         if (test "$LD" != "gcc" && test -z "$blibpath"); then 
    46                 blibpath="/usr/lib:/lib:/usr/local/lib" 
    47         fi 
    48         ;; 
    49 *-*-osf*) 
    50         CPPFLAGS="$CPPFLAGS -D_POSIX_PII_SOCKET" 
    51         ;; 
    52 *-*-linux*) 
    53         ;; 
    54 *-*-darwin*) 
    55         LIBS="$LIBS -Wl,-framework,CoreFoundation" 
    56         if test "$GCC" = "yes"; then 
    57                 CFLAGS="$CFLAGS -no-cpp-precomp" 
    58         fi 
     43case "${host}" in 
     44        *-*-hpux*) 
     45                CPPFLAGS="${CPPFLAGS} -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED" 
     46        ;; 
     47        *-*-solaris*) 
     48                CPPFLAGS="${CPPFLAGS} -I/usr/local/include" 
     49                LDFLAGS="${LDFLAGS} -L/usr/local/lib -R/usr/local/lib" 
     50                need_dash_r="1" 
     51        ;; 
     52        *-*-sunos4*) 
     53                CPPFLAGS="${CPPFLAGS} -DSUNOS4" 
     54        ;; 
     55        *-*-aix*) 
     56                CPPFLAGS="${CPPFLAGS} -I/usr/local/include" 
     57                LDFLAGS="${LDFLAGS} -L/usr/local/lib" 
     58                if test "${LD}" != "gcc" -a -z "${blibpath}"; then 
     59                        blibpath="/usr/lib:/lib:/usr/local/lib" 
     60                fi 
     61        ;; 
     62        *-*-osf*) 
     63                CPPFLAGS="${CPPFLAGS} -D_POSIX_PII_SOCKET" 
     64        ;; 
     65        *-*-darwin*) 
     66                LIBS="${LIBS} -Wl,-framework,CoreFoundation" 
     67                if test "${GCC}" = "yes"; then 
     68                        CFLAGS="${CFLAGS} -no-cpp-precomp" 
     69                fi 
    5970        ;; 
    6071esac 
    6172 
    62 AC_ARG_WITH(common-dir, 
    63         AC_HELP_STRING([--with-common-dir=PATH], [Specify path for common installation libraries]), 
    64         [ 
    65                 if test "x$withval" != "xno" ; then 
    66                         trycommondir=$withval 
    67                 fi 
    68         ] 
    69 ) 
    70  
    71 saved_LDFLAGS="$LDFLAGS" 
    72 saved_CPPFLAGS="$CPPFLAGS" 
    73 AC_CACHE_CHECK([for common directory], ac_cv_commondir, [ 
    74         for commondir in $trycommondir "" /usr/local /usr/pkg /opt ; do 
    75                 # Skip directories if they don't exist 
    76                 if test ! -z "$commondir" -a ! -d "$commondir/" ; then 
    77                         continue; 
    78                 fi 
    79                 CPPFLAGS="$saved_CPPFLAGS" 
    80                 LDFLAGS="$saved_LDFLAGS" 
    81  
    82                 if test ! -z "$commondir" -a "x$commondir" != "x/usr"; then 
    83                         LDFLAGS="-L$commondir/lib $saved_LDFLAGS" 
    84                         if test ! -z "$need_dash_r" ; then 
    85                                 LDFLAGS="-R$commondir/lib $LDFLAGS" 
    86                         fi 
    87                         CPPFLAGS="-I$commondir/include $saved_CPPFLAGS" 
    88                 fi 
    89                 break; 
    90         done 
    91  
    92         if test -z "$commondir" ; then 
    93                 commondir="(system)" 
    94         fi 
    95         ac_cv_commondir=$commondir 
    96 ]) 
    97  
    98 dnl Options 
    99 AM_MAINTAINER_MODE 
     73rootlibdir="/lib${libdir##*/lib}" 
     74usrlibdir="/usr/lib${libdir##*/lib}" 
     75usrsbindir="/usr/sbin${libdir##*/sbin}" 
     76 
     77full_sysconfdir=`eval eval eval eval eval echo "${sysconfdir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"` 
     78full_localstatedir=`eval eval eval eval eval echo "${localstatedir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"` 
     79 
     80AC_ARG_ENABLE( 
     81        [strict], 
     82        [AC_HELP_STRING([--enable-strict], [enable strict compile mode @<:@disabled@:>@])], 
     83        , 
     84        [enable_strict="no"] 
     85) 
     86 
     87AC_ARG_ENABLE( 
     88        [pedantic], 
     89        [AC_HELP_STRING([--enable-pedantic], [enable pedantic compile mode @<:@disabled@:>@])], 
     90        , 
     91        [enable_pedantic="no"] 
     92) 
     93 
     94AC_ARG_ENABLE( 
     95        [doc], 
     96        [AC_HELP_STRING([--enable-doc], [enable installation of documents. @<:@disabled@:>@])], 
     97        , 
     98        [enable_doc="no"] 
     99) 
     100 
     101AC_ARG_ENABLE( 
     102        [api-doc], 
     103        [AC_HELP_STRING([--enable-api-doc], [enable generation and installation of api documents. @<:@disabled@:>@])], 
     104        , 
     105        [enable_api_doc="no"] 
     106) 
     107 
     108AC_ARG_ENABLE( 
     109        [pcsc], 
     110        [AC_HELP_STRING([--enable-pcsc], [enable pcsc support. @<:@disabled@:>@])], 
     111        , 
     112        [enable_pcsc="no"] 
     113) 
     114 
     115AC_ARG_ENABLE( 
     116        [usb], 
     117        [AC_HELP_STRING([--enable-usb], [enable usb support. @<:@disabled@:>@])], 
     118        , 
     119        [enable_usb="no"] 
     120) 
     121 
     122AC_ARG_ENABLE( 
     123        [debug], 
     124        [AC_HELP_STRING([--enable-debug], [enable debug messages. @<:@disabled@:>@])], 
     125        [test "${enableval}" = "yes" && AC_DEFINE([DEBUG], [1], [Enable debug messages.])] 
     126) 
     127 
     128AC_ARG_ENABLE( 
     129        [sunray], 
     130        [AC_HELP_STRING([--enable-sunray], [enable sunray support. @<:@disabled@:>@])], 
     131        [test "${enableval}" = "yes" && AC_DEFINE([sunray], [1], [Enable sunray support.])] 
     132) 
     133 
     134AC_ARG_ENABLE( 
     135        [sunrayclient], 
     136        [AC_HELP_STRING([--enable-sunrayclient], [enable sunray client support. @<:@disabled@:>@])], 
     137        [test "${enableval}" = "yes" && AC_DEFINE(sunrayclient, 1, [Enable sunray client support.])] 
     138) 
     139 
     140AC_ARG_WITH( 
     141        [bundle], 
     142        [AC_HELP_STRING([--with-bundle=PATH], [install bundle file for pcsc-lite to PATH @<:@not installed@:>@])], 
     143        [ 
     144                if test "${withval}" = "yes"; then 
     145                        bundledir="\$(libdir)" 
     146                else 
     147                        bundledir="${withval}" 
     148                fi 
     149        ], 
     150        [bundledir=""] 
     151) 
     152 
     153AC_ARG_WITH( 
     154        [udev], 
     155        [AC_HELP_STRING([--with-udev=PATH], [install udev files into PATH @<:@not installed@:>@])], 
     156        [ 
     157                if test "${withval}" = "yes"; then 
     158                        udevdir="\$(libdir)/udev" 
     159                else 
     160                        udevdir="${withval}" 
     161                fi 
     162        ], 
     163        [udevdir=""] 
     164) 
     165 
     166AC_ARG_WITH( 
     167        [hotplug], 
     168        [AC_HELP_STRING([--with-hotplug=PATH], [install hotplug files into PATH @<:@not installed@:>@])], 
     169        [ 
     170                if test "${withval}" = "yes"; then 
     171                        hotplugdir="\$(sysconfdir)/hotplug/usb" 
     172                else 
     173                        hotplugdir="${withval}" 
     174                fi 
     175        ], 
     176        [hotplugdir=""] 
     177) 
     178 
     179AC_ARG_WITH( 
     180        [ifddir], 
     181        [AC_HELP_STRING([--with-ifddir], [ifd directory. @<:@/usr/lib/ifd@:>@])], 
     182        [ifddir="${withval}"], 
     183        [ifddir="${usrlibdir}/ifd"] 
     184) 
     185 
     186AC_ARG_WITH( 
     187        [apidocdir], 
     188        [AC_HELP_STRING([--with-apidocdir], [put API documents at this directory, default HTMLDIR/api])], 
     189        [apidocdir="${with_apidocdir}"], 
     190        [apidocdir="\$(htmldir)/api"] 
     191) 
    100192 
    101193dnl Checks for programs. 
    … …  
    103195AC_PROG_INSTALL 
    104196AC_PROG_LN_S 
     197AC_PROG_MKDIR_P 
     198AC_PROG_SED 
    105199AC_PROG_MAKE_SET 
    106 AM_PROG_LEX 
    107  
    108 dnl Special check for pthread support. 
    109 ACX_PTHREAD( 
    110 [ 
    111  AC_DEFINE(HAVE_PTHREAD,1, 
    112   [Define if you have POSIX threads libraries and header files.]) 
    113 ], [ 
    114  AC_MSG_ERROR([POSIX thread support required]) 
    115 ]) 
    116 LIBS="$PTHREAD_LIBS $LIBS" 
    117 CFLAGS="$CFLAGS $PTHREAD_CFLAGS" 
    118 CC="$PTHREAD_CC" 
    119200 
    120201dnl Add libtool support. 
     202AM_PROG_CC_C_O 
    121203AM_PROG_LIBTOOL 
     204 
     205AC_CHECK_PROGS([DOXYGEN],[doxygen]) 
     206test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc]) 
     207 
     208dnl These required for svn checkout 
     209AC_ARG_VAR([XSLTPROC], [xsltproc utility]) 
     210AC_ARG_VAR([SVN], [subversion utility]) 
     211AC_ARG_VAR([WGET], [wget utility]) 
     212AC_ARG_VAR([WGET_OPTS], [wget options]) 
     213AC_ARG_VAR([TR], [tr utility]) 
     214AC_CHECK_PROGS([XSLTPROC],[xsltproc]) 
     215AC_CHECK_PROGS([SVN],[svn]) 
     216AC_CHECK_PROGS([WGET],[wget]) 
     217AC_CHECK_PROGS([TR],[tr]) 
     218test -z "${WGET_OPTS}" && WGET_OPTS="-nv" 
     219 
     220dnl svn checkout dependencies 
     221if test "${svn_checkout}" = "yes"; then 
     222        AC_MSG_CHECKING([XSLTPROC requirement]) 
     223        if test -n "${XSLTPROC}"; then 
     224                AC_MSG_RESULT([ok]) 
     225        else 
     226                if test "${enable_doc}" = "yes"; then 
     227                        AC_MSG_ERROR([Missing XSLTPROC svn build with doc]) 
     228                else 
     229                        AC_MSG_WARN(["make dist" will not work]) 
     230                fi 
     231        fi 
     232 
     233        AC_MSG_CHECKING([svn doc build dependencies]) 
     234        if test -n "${SVN}" -a -n "${TR}" -a -n "${WGET}"; then 
     235                AC_MSG_RESULT([ok]) 
     236        else 
     237                if test "${enable_doc}" = "yes"; then 
     238                        AC_MSG_ERROR([Missing SVN, TR or WGET for svn doc build]) 
     239                else 
     240                        AC_MSG_WARN(["make dist" will not work]) 
     241                fi 
     242        fi 
     243fi 
    122244 
    123245dnl Checks for header files. 
    124246AC_HEADER_STDC 
    125247AC_HEADER_SYS_WAIT 
    126 AC_CHECK_HEADERS([errno.h fcntl.h malloc.h stdlib.h string.h strings.h sys/time.h unistd.h getopt.h dlfcn.h sys/poll.h]) 
     248AC_CHECK_HEADERS([ \ 
     249        errno.h fcntl.h malloc.h stdlib.h string.h \ 
     250        strings.h sys/time.h unistd.h getopt.h \ 
     251        dlfcn.h sys/poll.h 
     252]) 
    127253 
    128254dnl Checks for typedefs, structures, and compiler characteristics. 
    … …  
    140266dnl C Compiler features 
    141267AC_C_INLINE 
    142 if test "$GCC" = "yes"; then 
    143         CFLAGS="-Wall $CFLAGS" 
    144 fi 
    145  
    146 dnl use ltdl 
     268 
     269dnl See if socket() is found from libsocket 
     270AC_CHECK_LIB( 
     271        [socket], 
     272        [socket], 
     273        [ 
     274                LIBS="${LIBS} -lsocket" 
     275                AC_CHECK_LIB( 
     276                        [resolv], 
     277                        [res_query], 
     278                        [LIBS="${LIBS} -lresolv"] 
     279                ) 
     280        ] 
     281) 
     282 
     283AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl]) 
     284AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl]) 
    147285if test -z "${LTLIB_LIBS}"; then 
    148     AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl]) 
    149     AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl]) 
    150  
    151     AC_CHECK_LIB( 
    152         [ltdl], 
    153         [lt_dlopen], 
    154         [LTLIB_LIBS="-lltdl"], 
    155         [AC_MSG_ERROR([ltdl1 not found, please install libltdl and/or libtool])]) 
    156  
    157     AC_CHECK_HEADER( 
    158         [ltdl.h], 
    159         , 
    160         [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])] 
    161     ) 
    162 fi 
    163 AC_SUBST([LTLIB_CFLAGS]) 
    164 AC_SUBST([LTLIB_LIBS]) 
    165  
    166 dnl See if socket() is found from libsocket 
    167 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket" ac_cv_func_socket_in_lsocket=yes], ac_cv_func_socket_in_lsocket=no) 
    168  
    169 AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage], 
    170                 ac_cv_have_ss_family_in_struct_ss, [ 
    171         AC_TRY_COMPILE( 
     286        AC_CHECK_LIB( 
     287                [ltdl], 
     288                [lt_dlopen], 
     289                [LTLIB_LIBS="-lltdl"], 
     290                [AC_MSG_ERROR([ltdl not found, please install libltdl and/or libtool])] 
     291        ) 
     292fi 
     293saved_CFLAGS="${CFLAGS}" 
     294CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}" 
     295AC_CHECK_HEADER( 
     296        [ltdl.h], 
     297        , 
     298        [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])] 
     299) 
     300CFLAGS="${saved_CFLAGS}" 
     301 
     302AC_MSG_CHECKING([struct sockaddr_storage::ss_family]) 
     303AC_TRY_COMPILE( 
     304        [ 
     305#include <sys/types.h> 
     306#include <sys/socket.h> 
     307        ], 
     308        [ 
     309struct sockaddr_storage s; 
     310s.ss_family = 1; 
     311        ], 
     312        [AC_MSG_RESULT([ok])], 
     313        [AC_TRY_COMPILE( 
    172314                [ 
    173315#include <sys/types.h> 
    174316#include <sys/socket.h> 
    175317                ], 
    176                 [ struct sockaddr_storage s; s.ss_family = 1; ], 
    177                 [ ac_cv_have_ss_family_in_struct_ss="yes" ], 
    178                 [ ac_cv_have_ss_family_in_struct_ss="no" ], 
     318                [ 
     319struct sockaddr_storage s; 
     320s.__ss_family = 1; 
     321                ], 
     322                [ 
     323                        AC_MSG_RESULT([hack]) 
     324                        AC_DEFINE_UNQUOTED([ss_family], [__ss_family], [sockaddr_storage.ss_family wrapper]) 
     325                ], 
     326                [AC_MSG_ERROR([Invalid struct sockaddr_storage])] 
     327        )] 
     328) 
     329 
     330dnl see if poll() is found from libpoll 
     331AC_CHECK_LIB([poll], [poll], [LIBS="$LIBS -lpoll"]) 
     332 
     333if test "${enable_usb}" = "yes"; then 
     334        PKG_CHECK_MODULES( 
     335                [LIBUSB], 
     336                [libusb], 
     337                [AC_DEFINE([ENABLE_LIBUSB], [1], [Have libusb libraries and header files])], 
     338                [AC_MSG_ERROR([Cannot detect libusb])] 
    179339        ) 
     340fi 
     341 
     342if test "${enable_pcsc}" = "yes"; then 
     343        case "$host" in 
     344                *-*-darwin*) 
     345                        if test -z "$PCSC_LIBS" -a -z "$PCSC_LIBS"; then 
     346                                PCSC_MSG=yes 
     347                                PCSC_CFLAGS="" 
     348                                PCSC_LIBS="-Wl,-framework,PCSC" 
     349                        fi 
     350                ;; 
     351                *) 
     352                        PKG_CHECK_MODULES( 
     353                                [PCSC], 
     354                                [libpcsclite], 
     355                                , 
     356                                [AC_MSG_ERROR([Cannot locate pcsc-lite])] 
     357                        ) 
     358                ;; 
     359        esac 
     360fi 
     361 
     362if test "${enable_usb}" = "yes"; then 
     363        OPTIONAL_LIBUSB_CFLAGS="${LIBUSB_CFLAGS}" 
     364        OPTIONAL_LIBUSB_LIBS="${LIBUSB_LIBS}" 
     365fi 
     366 
     367AC_DEFINE_UNQUOTED([OPENCT_CONF_PATH], ["${full_sysconfdir}/openct.conf"], [default config file for libopenct]) 
     368AC_DEFINE_UNQUOTED([OPENCT_MODULES_PATH], ["${ifddir}"], [modules path for libopenct]) 
     369AC_DEFINE_UNQUOTED([OPENCT_SOCKET_PATH], ["${full_localstatedir}/run/openct"], [socket path for libopenct]) 
     370AC_DEFINE_UNQUOTED([OPENCT_IFDHANDLER_PATH], ["${usrsbindir}/ifdhandler"], [ifdhandler path for libopenct]) 
     371 
     372AC_CREATE_STDINT_H([src/include/openct/types.h]) 
     373 
     374if test "${enable_pedantic}" = "yes"; then 
     375        enable_strict="yes"; 
     376        CFLAGS="${CFLAGS} -pedantic" 
     377fi 
     378if test "${enable_strict}" = "yes"; then 
     379        CFLAGS="${CFLAGS} -Wall -Wextra" 
     380fi 
     381 
     382pkgconfigdir="\$(libdir)/pkgconfig" 
     383openctincludedir="\$(includedir)/openct" 
     384 
     385AC_SUBST([pkgconfigdir]) 
     386AC_SUBST([openctincludedir]) 
     387AC_SUBST([apidocdir]) 
     388AC_SUBST([bundledir]) 
     389AC_SUBST([ifddir]) 
     390AC_SUBST([udevdir]) 
     391AC_SUBST([hotplugdir]) 
     392AC_SUBST([OPENCT_VERSION_MAJOR]) 
     393AC_SUBST([OPENCT_VERSION_MINOR]) 
     394AC_SUBST([OPENCT_VERSION_FIX]) 
     395AC_SUBST([OPENCT_LT_CURRENT]) 
     396AC_SUBST([OPENCT_LT_REVISION]) 
     397AC_SUBST([OPENCT_LT_AGE]) 
     398AC_SUBST([OPENCT_LT_OLDEST]) 
     399AC_SUBST([OPTIONAL_LIBUSB_CFLAGS]) 
     400AC_SUBST([OPTIONAL_LIBUSB_LIBS]) 
     401 
     402AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"]) 
     403AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"]) 
     404AM_CONDITIONAL([ENABLE_API_DOC], [test "${enable_api_doc}" = "yes"]) 
     405AM_CONDITIONAL([ENABLE_BUNDLES], [test -n "${bundledir}"]) 
     406AM_CONDITIONAL([ENABLE_UDEV], [test -n "${udevdir}"]) 
     407AM_CONDITIONAL([ENABLE_HOTPLUG], [test -n "${hotplugdir}"]) 
     408AM_CONDITIONAL([ENABLE_PCSC], [test "${enable_pcsc}" = "yes"]) 
     409 
     410AC_OUTPUT([ 
     411        Makefile 
     412        aclocal/Makefile 
     413        doc/Makefile 
     414        doc/doxygen.conf 
     415        doc/nonpersistent/Makefile 
     416        etc/Makefile 
     417        macos/Makefile 
     418        src/Makefile 
     419        src/ct/Makefile 
     420        src/ct/libopenct.pc 
     421        src/ctapi/Makefile 
     422        src/ifd/Makefile 
     423        src/include/Makefile 
     424        src/include/openct/Makefile 
     425        src/pcsc/Makefile 
     426        src/tools/Makefile 
     427        src/tools/openct-tool.1 
    180428]) 
    181429 
    182 AC_CACHE_CHECK([for __ss_family field in struct sockaddr_storage], 
    183                 ac_cv_have___ss_family_in_struct_ss, [ 
    184         AC_TRY_COMPILE( 
    185                 [ 
    186 #include <sys/types.h> 
    187 #include <sys/socket.h> 
    188                 ], 
    189                 [ struct sockaddr_storage s; s.__ss_family = 1; ], 
    190                 [ ac_cv_have___ss_family_in_struct_ss="yes" ], 
    191                 [ ac_cv_have___ss_family_in_struct_ss="no" ] 
    192         ) 
    193 ]) 
    194  
    195 if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" -a "x$ac_cv_have_ss_family_in_struct_ss" = "xno"; then 
    196         AC_DEFINE_UNQUOTED(ss_family, __ss_family, [sockaddr_storage.ss_family wrapper]) 
    197 fi 
    198  
    199 dnl see if poll() is found from libpoll 
    200 AC_CHECK_LIB(poll, poll, [LIBS="$LIBS -lpoll" ac_cv_func_poll_lpoll=yes], ac_cv_func_poll_lpoll=no) 
    201  
    202  
    203 PKG_CHECK_MODULES(LIBUSB, [libusb], [ 
    204         LIBUSB_MSG=yes 
    205         AC_DEFINE(HAVE_LIBUSB, 1, [Have libusb libraries and header files]) 
    206         ], [ 
    207         LIBUSB_MSG=no 
    208         ]) 
    209 AC_SUBST(LIBUSB_CFLAGS) 
    210 AC_SUBST(LIBUSB_LIBS) 
    211  
    212 case "$host" in 
    213 *-*-darwin*) 
    214         if test -z "$PCSC_LIBS" -a -z "$PCSC_LIBS" 
    215         then 
    216                 PCSC_MSG=yes 
    217                 PCSC_CFLAGS="" 
    218                 PCSC_LIBS="-Wl,-framework,PCSC" 
    219  
    220                 # overwrite autoconf cached variables, too. 
    221                 ac_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set} 
    222                 ac_env_PCSC_CFLAGS_value=$PCSC_CFLAGS 
    223                 ac_cv_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set} 
    224                 ac_cv_env_PCSC_CFLAGS_value=$PCSC_CFLAGS 
    225                 ac_env_PCSC_LIBS_set=${PCSC_LIBS+set} 
    226                 ac_cv_env_PCSC_LIBS_set=${PCSC_LIBS+set} 
    227                 ac_cv_env_PCSC_LIBS_value=$PCSC_LIBS 
    228         fi 
    229         ;; 
    230 esac 
    231  
    232 PKG_CHECK_MODULES(PCSC, [libpcsclite], [ 
    233         PCSC_MSG=yes 
    234         AC_DEFINE(HAVE_PCSC, 1, [Have PC/SC implementation]) 
    235         ], [ 
    236         PCSC_MSG=no 
    237         ]) 
    238 AC_SUBST(PCSC_CFLAGS) 
    239 AC_SUBST(PCSC_LIBS) 
    240  
    241 AM_CONDITIONAL(HAVE_PCSC, test "x$PCSC_MSG" = "xyes") 
    242 saved_LIBS="$LIBS" 
    243 saved_CFLAGS="$CFLAGS" 
    244 if test "x$PCSC_MSG" = "xyes"; then 
    245         CFLAGS="${PCSC_CFLAGS} $saved_CFLAGS" 
    246         LIBS="$PCSC_LIBS $saved_LIBS" 
    247         AC_TRY_LINK([ 
    248 #include <stdlib.h> 
    249 #ifdef __APPLE__ 
    250 #include <PCSC/wintypes.h> 
    251 #include <PCSC/winscard.h> 
    252 #else 
    253 #include <winscard.h> 
    254 #endif 
    255         ], [ 
    256 SCardControl(NULL, NULL, 0, NULL, NULL); 
    257         ], [ 
    258                 AC_DEFINE(HAVE_PCSC_OLD, 1, [old version of pc/sc-lite]) 
    259         ]) 
    260 fi 
    261 LIBS="$saved_LIBS" 
    262 CFLAGS="$saved_CFLAGS" 
    263  
    264 # check for reader.h 
    265 saved_CFLAGS="$CFLAGS" 
    266 CFLAGS="$CFLAGS $PCSC_CFLAGS" 
    267 AC_CHECK_HEADER(reader.h, 
    268         [AC_DEFINE([HAVE_READER_H], 1, [Define if pcsc-lite with reader.h exists])], 
    269         [AC_MSG_WARN([reader.h not found, install pcsc-lite 1.2.9-beta8 or later, or use PCSC_CFLAGS=... ./configure])], 
    270         [ #include <reader.h>]) 
    271 CFLAGS="$saved_CFLAGS" 
    272  
    273 BUNDLEDIR="${libdir}" 
    274 AC_ARG_WITH(bundle-dir, 
    275         AC_HELP_STRING([--with-bundle-dir=PATH], [install bundle file for pcsc-lite to PATH [[not installed]]]), 
    276         [ 
    277                 BUNDLEDIR="$withval" 
    278                 with_bundles=yes 
    279         ] 
    280 ) 
    281 AC_SUBST(BUNDLEDIR) 
    282 AM_CONDITIONAL(HAVE_BUNDLES, test "x$with_bundles" = "xyes") 
    283  
    284 dnl Enable/disable debugging messages. 
    285 AC_ARG_ENABLE(debug, 
    286         AC_HELP_STRING([--enable-debug], [enable debug messages. [[default=no]]]), 
    287         AC_DEFINE(DEBUG, 1, [Enable debug messages.])) 
    288  
    289 dnl Enable/disable SunRay support. 
    290 AC_ARG_ENABLE(sunray, 
    291         AC_HELP_STRING([--enable-sunray], [enable sunray support. [[default=no]]]), 
    292         AC_DEFINE(sunray, 1, [Enable sunray support.])) 
    293  
    294 AC_ARG_ENABLE(sunrayclient, 
    295         AC_HELP_STRING([--enable-sunrayclient], [enable sunray client support. [[default=no]]]), 
    296         AC_DEFINE(sunrayclient, 1, [Enable sunray client support.])) 
    297  
    298 CPPFLAGS="-I\${top_builddir}/src/include -I\${top_srcdir}/src/include $CPPFLAGS" 
    299  
    300 if test "x$prefix" = xNONE; then 
    301   prefix=$ac_default_prefix 
    302 fi 
    303 if test "x$exec_prefix" = xNONE; then 
    304   exec_prefix='${prefix}' 
    305 fi 
    306  
    307 openct_etc_path=`eval echo ${sysconfdir}` ; openct_etc_path=`eval echo ${openct_etc_path}` 
    308 AC_DEFINE_UNQUOTED(OPENCT_ETC_PATH, "$openct_etc_path", [etc path for libopenct]) 
    309 openct_conf_path=`eval echo ${openct_etc_path}/openct.conf` 
    310 AC_DEFINE_UNQUOTED(OPENCT_CONF_PATH, "$openct_conf_path", [default config file for libopenct]) 
    311 AC_SUBST(openct_conf_path) 
    312  
    313 openct_modules_path=`eval echo ${libdir}` ; openct_modules_path=`eval echo ${openct_modules_path}/ifd` 
    314 AC_DEFINE_UNQUOTED(OPENCT_MODULES_PATH, "$openct_modules_path", [modules path for libopenct]) 
    315  
    316 a=`eval echo $localstatedir`; b=`eval echo ${prefix}/var` 
    317 if test "$a" = "$b"; then localstatedir="/var"; fi      # No one has touched the default settings, so use /var 
    318 openct_socket_path=`eval echo ${localstatedir}` ; openct_socket_path=`eval echo ${openct_socket_path}/run/openct` 
    319 AC_DEFINE_UNQUOTED(OPENCT_SOCKET_PATH, "$openct_socket_path", [socket path for libopenct]) 
    320  
    321 openct_status_path=`eval echo ${openct_socket_path}` ; openct_status_path=`eval echo ${openct_status_path}/status` 
    322 AC_DEFINE_UNQUOTED(OPENCT_STATUS_PATH, "$openct_status_path", [status path for libopenct]) 
    323  
    324 openct_ifdhandler_path=`eval echo ${sbindir}` ; openct_ifdhandler_path=`eval echo ${openct_ifdhandler_path}/ifdhandler` 
    325 AC_DEFINE_UNQUOTED(OPENCT_IFDHANDLER_PATH, "$openct_ifdhandler_path", [ifdhandler path for libopenct]) 
    326  
    327 pkgdata=`eval echo ${datadir}/${PACKAGE}` ; pkgdata=`eval echo ${pkgdata}` 
    328 AC_SUBST(pkgdata) 
    329  
    330 sysincludedir='${exec_prefix}/include' 
    331 AC_SUBST(sysincludedir) 
    332  
    333 AC_OUTPUT([ 
    334 Makefile 
    335 aclocal/Makefile 
    336 doc/Makefile 
    337 doc/doxygen.conf 
    338 etc/Makefile 
    339 macos/Makefile 
    340 src/Makefile 
    341 src/ct/Makefile 
    342 src/ct/libopenct.pc 
    343 src/ctapi/Makefile 
    344 src/ifd/Makefile 
    345 src/include/Makefile 
    346 src/include/openct/Makefile 
    347 src/pcsc/Makefile 
    348 src/tools/Makefile 
    349 src/tools/openct-tool.1 
    350 ]) 
    351  
    352 AC_CREATE_STDINT_H(src/include/openct/types.h) 
    353  
    354 A=`eval echo ${prefix}` ; A=`eval echo ${A}` 
    355 B=`eval echo ${bindir}` ; B=`eval echo ${B}` 
    356 C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}` 
    357  
    358 echo "" 
    359 echo "OpenCT has been configured with the following options" 
    360  
    361 echo "" 
    362 echo "Version:             ${PACKAGE_VERSION}" 
    363 echo "User binaries:       ${B}" 
    364 echo "Configuration files: ${C}" 
    365  
    366 echo "" 
    367 echo "Host:                ${host}" 
    368 echo "Compiler:            ${CC}" 
    369 echo "Compiler flags:      ${CFLAGS}" 
    370 echo "Preprocessor flags:  ${CPPFLAGS}" 
    371 echo "Linker flags:        ${LDFLAGS}" 
    372 echo "Libraries:           ${LIBS}" 
    373  
    374 echo "" 
    375 echo "PC/SC support:       ${PCSC_MSG}" 
    376 echo "Libusb used:         ${LIBUSB_MSG}" 
    377 echo "" 
    378  
    379 if test "${USB_MSG}" != "yes"; then 
    380   echo "Without libusb coldplugging will not work." 
    381   echo "To use usb devices, your hotplugging needs to be" 
    382   echo "configured and you need to plug in any device " 
    383   echo "after the system has started (i.e. the init script ran)" 
    384 fi 
     430cat <<EOF 
     431 
     432OpenCT has been configured with the following options: 
     433 
     434 
     435Version:                 ${PACKAGE_VERSION} 
     436Libraries:               $(eval eval eval echo "${libdir}") 
     437 
     438doc support:             ${enable_doc} 
     439api doc support:         ${enable_api_doc} 
     440usb support:             ${enable_usb} 
     441pcsc support:            ${enable_pcsc} 
     442doc support:             ${enable_doc} 
     443 
     444Host:                    ${host} 
     445Compiler:                ${CC} 
     446Preprocessor flags:      ${CPPFLAGS} 
     447Compiler flags:          ${CFLAGS} 
     448Linker flags:            ${LDFLAGS} 
     449Libraries:               ${LIBS} 
     450 
     451LIBUSB_CFLAGS:           ${LIBUSB_CFLAGS} 
     452LIBUSB_LIBS:             ${LIBUSB_LIBS} 
     453PCSC_CFLAGS:             ${PCSC_CFLAGS} 
     454PCSC_LIBS:               ${PCSC_LIBS} 
     455 
     456bundledir:               ${bundledir} 
     457ifddir:                  ${ifddir} 
     458udevdir:                 ${udevdir} 
     459hotplugdir:              ${hotplugdir} 
     460 
     461EOF 
     462 
     463if test "${enable_usb}" != "yes"; then 
     464 
     465cat <<EOF 
     466 
     467Without libusb coldplugging will not work. 
     468To use usb devices, your hotplugging needs to be 
     469configured and you need to plug in any device 
     470after the system has started (i.e. the init script ran) 
     471 
     472EOF 
     473 
     474fi 

  • trunk/doc

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/doc/Makefile.am

    r759 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in $(HTML) ChangeLog 
     3if ENABLE_DOC 
     4SUBDIRS = nonpersistent 
     5endif 
     6DIST_SUBDIRS = nonpersistent 
    47 
    5 EXTRA_DIST = README export-wiki.sh export-wiki.xsl generate-api.sh \ 
    6         $(HTML) index.html ChangeLog 
     8dist_doc_DATA = README 
     9dist_noinst_DATA = $(srcdir)/doxygen-footer.html $(srcdir)/*.gif 
    710 
    8 HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css $(srcdir)/api/*) 
     11if ENABLE_API_DOC 
    912 
    10 index.html: 
    11         sh $(srcdir)/export-wiki.sh $(srcdir) 
    12         sh $(srcdir)/generate-api.sh $(srcdir) 
    13         sh $(srcdir)/changelog.sh $(srcdir) 
     13apidoc_DATA=api.out/html/* 
     14 
     15 
     16api.out/html/*: \ 
     17                $(top_srcdir)/src/include/openct/*.h \ 
     18                $(srcdir)/*.gif \ 
     19                doxygen.conf 
     20        -rm -fr api.out 
     21        $(DOXYGEN) doxygen.conf 
     22        cp "$(srcdir)"/*.gif api.out/html 
     23 
     24endif 
     25 
     26clean-local: 
     27        -rm -fr api.out 

  • trunk/doc/doxygen.conf.in

    r704 r1028  
    1 # Doxyfile 1.4.2 
     1# Doxyfile 1.5.4 
    22 
    33# This file describes the settings to be used by the documentation system 
    … …  
    1515#--------------------------------------------------------------------------- 
    1616 
     17# This tag specifies the encoding used for all characters in the config file that  
     18# follow. The default is UTF-8 which is also the encoding used for all text before  
     19# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into  
     20# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of  
     21# possible encodings. 
     22 
     23DOXYFILE_ENCODING      = UTF-8 
     24 
    1725# The PROJECT_NAME tag is a single word (or a sequence of words surrounded  
    1826# by quotes) that should identify the project. 
    … …  
    3139# where doxygen was started. If left blank the current directory will be used. 
    3240 
    33 OUTPUT_DIRECTORY       = doc 
     41OUTPUT_DIRECTORY       = api.out 
    3442 
    3543# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create  
    … …  
    4654# information to generate all constant output in the proper language.  
    4755# The default language is English, other supported languages are:  
    48 # Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,  
    49 # Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,  
    50 # Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,  
    51 # Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,  
    52 # Swedish, and Ukrainian. 
     56# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,  
     57# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,  
     58# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,  
     59# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,  
     60# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. 
    5361 
    5462OUTPUT_LANGUAGE        = English 
    55  
    56 # This tag can be used to specify the encoding used in the generated output.  
    57 # The encoding is not always determined by the language that is chosen,  
    58 # but also whether or not the output is meant for Windows or non-Windows users.  
    59 # In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES  
    60 # forces the Windows encoding (this is the default for the Windows binary),  
    61 # whereas setting the tag to NO uses a Unix-style encoding (the default for  
    62 # all platforms other than Windows). 
    63  
    64 USE_WINDOWS_ENCODING   = NO 
    6563 
    6664# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will  
    … …  
    116114# path to strip. 
    117115 
    118 STRIP_FROM_PATH        =  
     116STRIP_FROM_PATH        = @top_srcdir@/src/include 
    119117 
    120118# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of  
    … …  
    136134# will interpret the first line (until the first dot) of a JavaDoc-style  
    137135# comment as the brief description. If set to NO, the JavaDoc  
    138 # comments will behave just like the Qt-style comments (thus requiring an  
    139 # explicit @brief command for a brief description. 
     136# comments will behave just like regular Qt-style comments  
     137# (thus requiring an explicit @brief command for a brief description.) 
    140138 
    141139JAVADOC_AUTOBRIEF      = YES 
     140 
     141# If the QT_AUTOBRIEF tag is set to YES then Doxygen will  
     142# interpret the first line (until the first dot) of a Qt-style  
     143# comment as the brief description. If set to NO, the comments  
     144# will behave just like regular Qt-style comments (thus requiring  
     145# an explicit \brief command for a brief description.) 
     146 
     147QT_AUTOBRIEF           = NO 
    142148 
    143149# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen  
    … …  
    161167 
    162168INHERIT_DOCS           = YES 
    163  
    164 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC  
    165 # tag is set to YES, then doxygen will reuse the documentation of the first  
    166 # member in the group (if any) for the other members of the group. By default  
    167 # all members of a group must be documented explicitly. 
    168  
    169 DISTRIBUTE_GROUP_DOC   = NO 
    170169 
    171170# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce  
    … …  
    196195OPTIMIZE_OUTPUT_FOR_C  = YES 
    197196 
    198 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources  
    199 # only. Doxygen will then generate output that is more tailored for Java.  
     197# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java  
     198# sources only. Doxygen will then generate output that is more tailored for Java.  
    200199# For instance, namespaces will be presented as packages, qualified scopes  
    201200# will look different, etc. 
    202201 
    203202OPTIMIZE_OUTPUT_JAVA   = NO 
     203 
     204# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to  
     205# include (a tag file for) the STL sources as input, then you should  
     206# set this tag to YES in order to let doxygen match functions declarations and  
     207# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.  
     208# func(std::string) {}). This also make the inheritance and collaboration  
     209# diagrams that involve STL classes more complete and accurate. 
     210 
     211BUILTIN_STL_SUPPORT    = NO 
     212 
     213# If you use Microsoft's C++/CLI language, you should set this option to YES to 
     214# enable parsing support. 
     215 
     216CPP_CLI_SUPPORT        = NO 
     217 
     218# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.  
     219# Doxygen will parse them like normal C++ but will assume all classes use public  
     220# instead of private inheritance when no explicit protection keyword is present. 
     221 
     222SIP_SUPPORT            = NO 
     223 
     224# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC  
     225# tag is set to YES, then doxygen will reuse the documentation of the first  
     226# member in the group (if any) for the other members of the group. By default  
     227# all members of a group must be documented explicitly. 
     228 
     229DISTRIBUTE_GROUP_DOC   = NO 
    204230 
    205231# Set the SUBGROUPING tag to YES (the default) to allow class member groups of  
    … …  
    211237SUBGROUPING            = YES 
    212238 
     239# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct (or union) is  
     240# documented as struct with the name of the typedef. So  
     241# typedef struct TypeS {} TypeT, will appear in the documentation as a struct  
     242# with name TypeT. When disabled the typedef will appear as a member of a file,  
     243# namespace, or class. And the struct will be named TypeS. This can typically  
     244# be useful for C code where the coding convention is that all structs are  
     245# typedef'ed and only the typedef is referenced never the struct's name. 
     246 
     247TYPEDEF_HIDES_STRUCT   = NO 
     248 
    213249#--------------------------------------------------------------------------- 
    214250# Build related configuration options 
    … …  
    244280 
    245281EXTRACT_LOCAL_METHODS  = NO 
     282 
     283# If this flag is set to YES, the members of anonymous namespaces will be extracted  
     284# and appear in the documentation as a namespace called 'anonymous_namespace{file}',  
     285# where file will be replaced with the base name of the file that contains the anonymous  
     286# namespace. By default anonymous namespace are hidden. 
     287 
     288EXTRACT_ANON_NSPACES   = NO 
    246289 
    247290# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all  
    … …  
    377420# If the sources in your project are distributed over multiple directories  
    378421# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy  
    379 # in the documentation. 
     422# in the documentation. The default is NO. 
    380423 
    381424SHOW_DIRECTORIES       = YES 
    … …  
    386429# popen()) the command <command> <input-file>, where <command> is the value of  
    387430# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file  
    388 # provided by doxygen. Whatever the progam writes to standard output  
     431# provided by doxygen. Whatever the program writes to standard output  
    389432# is used as the file version. See the manual for examples. 
    390433 
    … …  
    434477# be obtained via FILE_VERSION_FILTER) 
    435478 
    436 WARN_FORMAT            = "$file:$line: $text" 
     479WARN_FORMAT            = "$file:$line: $text  " 
    437480 
    438481# The WARN_LOGFILE tag can be used to specify a file to which warning  
    … …  
    451494# with spaces. 
    452495 
    453 INPUT                  = src/include/openct 
     496INPUT                  = @top_srcdir@/src/include 
     497 
     498# This tag can be used to specify the character encoding of the source files that  
     499# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default  
     500# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.  
     501# See http://www.gnu.org/software/libiconv for the list of possible encodings. 
     502 
     503INPUT_ENCODING         = UTF-8 
    454504 
    455505# If the value of the INPUT tag contains directories, you can use the  
    … …  
    458508# blank the following patterns are tested:  
    459509# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx  
    460 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm 
     510# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 
    461511 
    462512FILE_PATTERNS          = *.h 
    … …  
    466516# If left blank NO is used. 
    467517 
    468 RECURSIVE              = NO 
     518RECURSIVE              = YES 
    469519 
    470520# The EXCLUDE tag can be used to specify files and/or directories that should  
    … …  
    482532# If the value of the INPUT tag contains directories, you can use the  
    483533# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude  
    484 # certain files from those directories. 
    485  
    486 EXCLUDE_PATTERNS       =  
     534# certain files from those directories. Note that the wildcards are matched  
     535# against the file with absolute path, so to exclude all test directories  
     536# for example use the pattern */test/* 
     537 
     538EXCLUDE_PATTERNS       = */.svn/* 
     539 
     540# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names  
     541# (namespaces, classes, functions, etc.) that should be excluded from the output.  
     542# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,  
     543# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test 
     544 
     545EXCLUDE_SYMBOLS        =  
    487546 
    488547# The EXAMPLE_PATH tag can be used to specify one or more files or  
    … …  
    544603# be generated. Documented entities will be cross-referenced with these sources.  
    545604# Note: To get rid of all source code in the generated output, make sure also  
    546 # VERBATIM_HEADERS is set to NO. 
     605# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH  
     606# then you must also enable this option. If you don't then doxygen will produce  
     607# a warning and turn it on anyway 
    547608 
    548609SOURCE_BROWSER         = YES 
    … …  
    570631 
    571632REFERENCES_RELATION    = YES 
     633 
     634# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
     635# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
     636# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
     637# link to the source code.  Otherwise they will link to the documentstion. 
     638 
     639REFERENCES_LINK_SOURCE = YES 
     640 
     641# If the USE_HTAGS tag is set to YES then the references to source code  
     642# will point to the HTML generated by the htags(1) tool instead of doxygen  
     643# built-in source browser. The htags tool is part of GNU's global source  
     644# tagging system (see http://www.gnu.org/software/global/global.html). You  
     645# will need version 4.8.6 or higher. 
     646 
     647USE_HTAGS              = NO 
    572648 
    573649# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen  
    … …  
    613689# put in front of it. If left blank `html' will be used as the default path. 
    614690 
    615 HTML_OUTPUT            = api 
     691HTML_OUTPUT            = html 
    616692 
    617693# The HTML_FILE_EXTENSION tag can be used to specify the file extension for  
    … …  
    631707# standard footer. 
    632708 
    633 HTML_FOOTER            =  
     709HTML_FOOTER            = @srcdir@/doxygen-footer.html 
    634710 
    635711# The HTML_STYLESHEET tag can be used to specify a user-defined cascading  
    … …  
    655731GENERATE_HTMLHELP      = NO 
    656732 
     733# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML  
     734# documentation will contain sections that can be hidden and shown after the  
     735# page has loaded. For this to work a browser that supports  
     736# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox  
     737# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). 
     738 
     739HTML_DYNAMIC_SECTIONS  = NO 
     740 
    657741# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can  
    658742# be used to specify the file name of the resulting .chm file. You  
    … …  
    9571041# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES  
    9581042# then the macro expansion is limited to the macros specified with the  
    959 # PREDEFINED and EXPAND_AS_PREDEFINED tags. 
     1043# PREDEFINED and EXPAND_AS_DEFINED tags. 
    9601044 
    9611045EXPAND_ONLY_PREDEF     = NO 
    … …  
    10601144CLASS_DIAGRAMS         = YES 
    10611145 
     1146# You can define message sequence charts within doxygen comments using the \msc  
     1147# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to  
     1148# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to  
     1149# specify the directory where the mscgen tool resides. If left empty the tool is assumed to  
     1150# be found in the default search path. 
     1151 
     1152MSCGEN_PATH            =  
     1153 
    10621154# If set to YES, the inheritance and collaboration graphs will hide  
    10631155# inheritance and usage relations if the target is undocumented  
    … …  
    11171209INCLUDED_BY_GRAPH      = YES 
    11181210 
    1119 # If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will  
     1211# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will  
    11201212# generate a call dependency graph for every global function or class method.  
    11211213# Note that enabling this option will significantly increase the time of a run.  
    … …  
    11251217CALL_GRAPH             = NO 
    11261218 
     1219# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will  
     1220# generate a caller dependency graph for every global function or class method.  
     1221# Note that enabling this option will significantly increase the time of a run.  
     1222# So in most cases it will be better to enable caller graphs for selected  
     1223# functions only using the \callergraph command. 
     1224 
     1225CALLER_GRAPH           = NO 
     1226 
    11271227# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen  
    11281228# will graphical hierarchy of all classes instead of a textual one. 
    … …  
    11541254DOTFILE_DIRS           =  
    11551255 
    1156 # The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width  
    1157 # (in pixels) of the graphs generated by dot. If a graph becomes larger than  
    1158 # this value, doxygen will try to truncate the graph, so that it fits within  
    1159 # the specified constraint. Beware that most browsers cannot cope with very  
    1160 # large images. 
    1161  
    1162 MAX_DOT_GRAPH_WIDTH    = 1024 
    1163  
    1164 # The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height  
    1165 # (in pixels) of the graphs generated by dot. If a graph becomes larger than  
    1166 # this value, doxygen will try to truncate the graph, so that it fits within  
    1167 # the specified constraint. Beware that most browsers cannot cope with very  
    1168 # large images. 
    1169  
    1170 MAX_DOT_GRAPH_HEIGHT   = 1024 
     1256# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of  
     1257# nodes that will be shown in the graph. If the number of nodes in a graph  
     1258# becomes larger than this value, doxygen will truncate the graph, which is  
     1259# visualized by representing a node as a red box. Note that doxygen if the number  
     1260# of direct children of the root node in a graph is already larger than  
     1261# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note  
     1262# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. 
     1263 
     1264DOT_GRAPH_MAX_NODES    = 50 
    11711265 
    11721266# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the  
    … …  
    11751269# that lay further from the root node will be omitted. Note that setting this  
    11761270# option to 1 or 2 may greatly reduce the computation time needed for large  
    1177 # code bases. Also note that a graph may be further truncated if the graph's  
    1178 # image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH  
    1179 # and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default),  
    1180 # the graph is not depth-constrained. 
     1271# code bases. Also note that the size of a graph can be further restricted by  
     1272# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. 
    11811273 
    11821274MAX_DOT_GRAPH_DEPTH    = 0 

  • trunk/etc

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
        26 hotplug.openct 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
        2763init-script 
        2864openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/etc/Makefile.am

    r996 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
    5 DISTCLEANFILES = openct.conf init-script openct.hald reader.conf \ 
     3CLEANFILES = openct.conf init-script openct.hald reader.conf \ 
    64                openct_usb openct_pcmcia openct_serial 
    75 
    8 EXTRA_DIST = Info.plist openct.usermap openct.udev openct.udev.modalias \ 
     6SUFFIXES = .in 
     7 
     8noinst_DATA = openct.conf reader.conf 
     9noinst_SCRIPTS = init-script openct.hald 
     10dist_noinst_DATA = Info.plist openct.udev openct.udev.modalias \ 
    911        openct.conf.in init-script.in openct.hald.in reader.conf.in \ 
    1012        openct_usb.in openct_pcmcia.in openct_serial.in openct.fdi 
    1113 
    12 noinst_DATA = openct.conf reader.conf 
     14if ENABLE_UDEV 
     15udev_SCRIPTS = openct_usb openct_pcmcia openct_serial 
     16else 
     17dist_noinst_SCRIPTS = openct_usb openct_pcmcia openct_serial 
     18endif 
    1319 
    14 noinst_SCRIPTS = openct_usb openct_pcmcia openct_serial init-script openct.hald 
     20if ENABLE_HOTPLUG 
     21hotplug_DATA = openct.usermap 
     22else 
     23dist_noinst_DATA += openct.usermap 
     24endif 
    1525 
    16 openct_usb: openct_usb.in 
    17         sed -e "s#SBINDIR#${sbindir}#g" < $^ > $@ 
    18         chmod 755 $@ 
    1926 
    20 openct_pcmcia: openct_pcmcia.in 
    21         sed -e "s#SBINDIR#${sbindir}#g" < $^ > $@ 
    22         chmod 755 $@ 
    23  
    24 openct_serial: openct_serial.in 
    25         sed -e "s#SBINDIR#${sbindir}#g" < $^ > $@ 
    26         chmod 755 $@ 
    27  
    28 reader.conf: reader.conf.in 
    29         sed -e "s#LIBDIR#${libdir}#g" < $^ > $@ 
    30  
    31 init-script: init-script.in 
    32         sed -e "s#SBINDIR#${sbindir}#g" < $^ > $@ 
    33         chmod 755 $@ 
    34  
    35 %: %.in 
    36         sed -e "s#SBINDIR#${sbindir}#g" < $^ > $@ 
    37  
    38 install-data-local: openct_usb openct_pcmcia openct_serial 
    39         @set -e; if test -w $(DESTDIR)/lib/udev; then \ 
    40                 echo install -m 755 openct_usb $(DESTDIR)/lib/udev/openct_usb; \ 
    41                 install -m 755 openct_usb $(DESTDIR)/lib/udev/openct_usb; \ 
    42                 echo install -m 755 openct_pcmcia $(DESTDIR)/lib/udev/openct_pcmcia; \ 
    43                 install -m 755 openct_pcmcia $(DESTDIR)/lib/udev/openct_pcmcia; \ 
    44                 echo install -m 755 openct_serial $(DESTDIR)/lib/udev/openct_serial; \ 
    45                 install -m 755 openct_serial $(DESTDIR)/lib/udev/openct_serial; \ 
    46         else \ 
    47                 echo "*** Please install udev scripts manually" >&2; \ 
    48         fi 
    49         @set -e; if test -w $(DESTDIR)/$(sysconfdir)/hotplug/usb; then \ 
    50                 echo install -m 644 openct.usermap $(DESTDIR)$(sysconfdir)/hotplug/usb; \ 
    51                 install -m 644 openct.usermap $(DESTDIR)$(sysconfdir)/hotplug/usb; \ 
    52         else \ 
    53                 echo "*** Please install hotplug map file manually, if needed" >&2; \ 
    54         fi 
     27.in: 
     28        $(SED) -e "s#SBINDIR#$(sbindir)#g" -e "s#LIBDIR#$(libdir)#g" < "$^" > "$@" 

  • trunk/macos

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/macos/Makefile.am

    r404 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 EXTRA_DIST = libtool-bundle 
    4  
    5 MAINTAINERCLEANFILES = Makefile.in 
     3dist_noinst_SCRIPTS = libtool-bundle 

  • trunk/solaris

    • Property svn:ignore set to
      Makefile
      Makefile.in
      core
      archive
      acinclude.m4
      aclocal.m4
      autom4te.cache
      compile
      confdefs.h
      config.*
      configure
      conftest
      conftest.c
      depcomp
      install-sh
      libtool
      libtool.m4
      ltmain.sh
      missing
      mkinstalldirs
      so_locations
      stamp-h*

      .deps
      .libs
      .#*#
      .*.bak
      .*.orig
      .*.rej
      .*~
      #*#
      *.bak
      *.d
      *.def
      *.dll
      *.exe
      *.la
      *.lib
      *.lo
      *.orig
      *.pdb
      *.rej
      *.u
      *.rc
      *.pc
      *~
      *.gz
      *.bz2
      *.[0-9]
      *.html
      *.gif
      *.css
      *.out
      *.loT

      ChangeLog
      doxygen.conf
      reader.conf
      openct_serial
      openct.hald
      openct_usb
      openct_pcmcia
      init-script
      openct.conf
      types.h
      ifdhandler
      ifdproxy
      openct-tool
      openct-control

  • trunk/src

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/src/Makefile.am

    r698 r1028  
    1 # Process this file with automake to create Makefile.in 
    2  
    3 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    42 
    53# Order IS important 

  • trunk/src/ct

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
        26 libopenct.pc 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/src/ct/Makefile.am

    r820 r1028  
    1 # Process this file with automake to create Makefile.in 
    2  
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
    5 EXTRA_DIST = libopenct.pc.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    62 
    73lib_LTLIBRARIES = libopenct.la 
     4pkgconfig_DATA = libopenct.pc 
    85 
    96libopenct_la_SOURCES = \ 
    107        buffer.c client.c error.c mainloop.c path.c \ 
    118        socket.c status.c tlv.c 
    12 libopenct_la_LDFLAGS = -version-info @OPENCT_LT_CURRENT@:@OPENCT_LT_REVISION@:@OPENCT_LT_AGE@ 
    13  
    14 pkgconfigdir = $(libdir)/pkgconfig 
    15 pkgconfig_DATA = libopenct.pc 
     9libopenct_la_CFLAGS = $(AM_CFLAGS) \ 
     10        -I$(top_srcdir)/src/include \ 
     11        -I$(top_builddir)/src/include 
     12libopenct_la_LDFLAGS = \ 
     13        -version-info @OPENCT_LT_CURRENT@:@OPENCT_LT_REVISION@:@OPENCT_LT_AGE@ \ 
     14        -no-undefined 

  • trunk/src/ctapi

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/src/ctapi/Makefile.am

    r495 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
     3openctinclude_HEADERS = ctapi.h 
    54lib_LTLIBRARIES = libopenctapi.la 
    65 
    76libopenctapi_la_SOURCES = ctapi.c ctapi.h 
    8 libopenctapi_la_LDFLAGS = -avoid-version 
    9 libopenctapi_la_LIBADD = ../ct/libopenct.la 
    10  
    11 includedir = @includedir@/openct 
    12 include_HEADERS = ctapi.h 
     7libopenctapi_la_LIBADD = $(top_builddir)/src/ct/libopenct.la 
     8libopenctapi_la_CFLAGS = $(AM_CFLAGS) \ 
     9        -I$(top_srcdir)/src/include \ 
     10        -I$(top_builddir)/src/include 
     11libopenctapi_la_LDFLAGS = -avoid-version -no-undefined --module 

  • trunk/src/ifd

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
        2666ifdhandler 
        2767ifdproxy 
        28 .gdbinit 
         68openct-tool 
         69openct-control 

  • trunk/src/ifd/Makefile.am

    r1011 r1028  
    1 # Process this file with automake to create Makefile.in 
    2  
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
    5 INCLUDES = $(CPPFLAGS) $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(LTLIB_CFLAGS) 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    62 
    73noinst_LTLIBRARIES = libifd.la 
    8  
    94sbin_PROGRAMS = ifdhandler ifdproxy 
     5noinst_HEADERS = atr.h ctbcs.h ifdhandler.h internal.h ria.h usb-descriptors.h 
    106 
    117libifd_la_SOURCES = \ 
    … …  
    2723        ria.c 
    2824# new driver not working yet: ifd-wbeiuu.c 
    29 libifd_la_LIBADD = ../ct/libopenct.la $(LTLIB_LIBS) $(LIBUSB_LIBS) 
     25libifd_la_LIBADD = $(top_builddir)/src/ct/libopenct.la $(LTLIB_LIBS) $(OPTIONAL_LIBUSB_LIBS) 
     26libifd_la_CFLAGS = $(AM_CFLAGS) \ 
     27        -I$(top_srcdir)/src/include \ 
     28        -I$(top_builddir)/src/include \ 
     29        $(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_LIBUSB_CFLAGS) $(LTLIB_CFLAGS) 
    3030 
    3131ifdhandler_SOURCES = ifdhandler.c 
    3232ifdhandler_LDADD = libifd.la 
     33ifdhandler_CFLAGS = $(AM_CFLAGS) \ 
     34        -I$(top_srcdir)/src/include \ 
     35        -I$(top_builddir)/src/include 
    3336 
    3437ifdproxy_SOURCES = ifdproxy.c ria-device.c ria-server.c 
    3538ifdproxy_LDADD = libifd.la 
    36  
    37 noinst_HEADERS = atr.h ctbcs.h ifdhandler.h internal.h ria.h usb-descriptors.h 
     39ifdproxy_CFLAGS = $(AM_CFLAGS) \ 
     40        -I$(top_srcdir)/src/include \ 
     41        -I$(top_builddir)/src/include 

  • trunk/src/ifd/atr.c

    r964 r1028  
    55 */ 
    66 
     7#include "internal.h" 
    78#include <string.h> 
    8 #include "internal.h" 
    99#include "atr.h" 
    1010 

  • trunk/src/ifd/ifd-cm4000.c

    r964 r1028  
    1313#ifdef linux 
    1414 
     15#include "internal.h" 
    1516#include "cardman.h" 
    16 #include "internal.h" 
    1717#include <stdlib.h> 
    1818#include <string.h> 

  • trunk/src/ifd/ifd-pertosmart1030.c

    r950 r1028  
    55 */ 
    66 
     7#include "internal.h" 
    78#include <string.h> 
    89#include <stdlib.h> 
    910#include <unistd.h> 
    1011 
    11 #include "internal.h" 
    1212#include "atr.h" 
    1313#include "usb-descriptors.h" 

  • trunk/src/ifd/ifd-pertosmart1038.c

    r871 r1028  
    55 */ 
    66 
     7#include "internal.h" 
    78#include <string.h> 
    89#include <stdlib.h> 
    910#include <unistd.h> 
    1011 
    11 #include "internal.h" 
    1212#include "atr.h" 
    1313 

  • trunk/src/ifd/ifd-rutoken.c

    r1012 r1028  
    66 */ 
    77 
     8#include "internal.h" 
    89#include <unistd.h> 
    910#include <string.h> 
    10 #include "internal.h" 
    1111 
    1212#define MAX_BUF_T0_LEN  256 

  • trunk/src/ifd/sys-linux.c

    r943 r1028  
    2626#include <errno.h> 
    2727#include <limits.h> 
    28 #ifdef HAVE_LIBUSB 
     28#ifdef ENABLE_LIBUSB 
    2929#include <usb.h> 
    3030#endif 
    … …  
    385385int ifd_scan_usb(void) 
    386386{ 
    387 #ifdef HAVE_LIBUSB 
     387#ifdef ENABLE_LIBUSB 
    388388        ifd_devid_t id; 
    389389        struct usb_bus *bus; 

  • trunk/src/include

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/src/include/Makefile.am

    r356 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
    5 SUBDIRS = . openct 
     3SUBDIRS = openct 

  • trunk/src/include/openct

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
        2665types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/src/include/openct/Makefile.am

    r820 r1028  
    1 # Process this file with automake to create Makefile.in 
    2  
    3 MAINTAINERCLEANFILES = Makefile.in 
    4  
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    52DISTCLEANFILES = types.h 
    63 
    7 includedir = @includedir@/openct 
    8  
    9 include_HEADERS = \ 
     4openctinclude_HEADERS = \ 
    105        apdu.h buffer.h conf.h device.h driver.h error.h ifd.h \ 
    116        logging.h openct.h path.h protocol.h server.h socket.h tlv.h  
    12  
    13 sysincludedir = @sysincludedir@/openct 
    14 nodist_sysinclude_HEADERS = types.h 
     7nodist_openctinclude_HEADERS = $(builddir)/types.h 

  • trunk/src/pcsc

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
         69openct-control 

  • trunk/src/pcsc/Makefile.am

    r937 r1028  
    1 # Process this file with automake to create Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    3 bundledir = $(BUNDLEDIR) 
    4  
    5 MAINTAINERCLEANFILES = Makefile.in 
    6  
    7 INCLUDES = -I$(top_srcdir)/src/ctapi $(CPPFLAGS) $(PCSC_CFLAGS) 
    8  
    9 if HAVE_PCSC 
     3if ENABLE_PCSC 
    104lib_LTLIBRARIES = openct-ifd.la 
    115endif 
    126 
    137openct_ifd_la_SOURCES = pcsc.c 
    14 openct_ifd_la_LDFLAGS = -module -avoid-version 
    15 openct_ifd_la_LIBADD = ../ctapi/libopenctapi.la 
     8openct_ifd_la_LDFLAGS = -module -avoid-version -no-undefined 
     9openct_ifd_la_LIBADD = $(PCSC_LIBS) $(top_builddir)/src/ctapi/libopenctapi.la 
     10openct_ifd_la_CFLAGS = $(AM_CFLAGS) \ 
     11        -I$(top_srcdir)/src/include \ 
     12        -I$(top_builddir)/src/include \ 
     13        -I$(top_srcdir)/src/ctapi \ 
     14        $(PCSC_CFLAGS) 
    1615 
    17 # Don't use HAVE_BUNDLES for this case, pcsc-lite loads 
     16# Don't use ENABLE_BUNDLES for this case, pcsc-lite loads 
    1817# USB drivers from MacOS X like bundles for all platforms 
    1918install-exec-local: install-libLTLIBRARIES 
    20 if HAVE_PCSC 
    21 if HAVE_BUNDLES 
    22         $(mkinstalldirs) $(DESTDIR)$(bundledir) 
    23         ${top_srcdir}/macos/libtool-bundle -e $(top_srcdir)/etc/Info.plist \ 
    24         $(DESTDIR)$(libdir)/openct-ifd.so $(DESTDIR)$(bundledir)/ 
     19if ENABLE_PCSC 
     20if ENABLE_BUNDLES 
     21        $(MKDIR_P) "$(DESTDIR)$(bundledir)" 
     22        "$(top_srcdir)/macos/libtool-bundle" -e "$(top_srcdir)/etc/Info.plist" \ 
     23                "$(DESTDIR)$(libdir)/openct-ifd.so" "$(DESTDIR)$(bundledir)" 
    2524endif 
    2625endif 
    2726 
    2827uninstall-local: uninstall-libLTLIBRARIES 
    29 if HAVE_PCSC 
    30 if HAVE_BUNDLES 
    31         rm -rf $(DESTDIR)$(bundledir)/openct-ifd.bundle/ 
     28if ENABLE_PCSC 
     29if ENABLE_BUNDLES 
     30        rm -rf "$(DESTDIR)$(bundledir)/openct-ifd.bundle/" 
    3231endif 
    3332endif 

  • trunk/src/tools

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54*.loT 
         55 
         56ChangeLog 
         57doxygen.conf 
         58reader.conf 
         59openct_serial 
         60openct.hald 
         61openct_usb 
         62openct_pcmcia 
         63init-script 
         64openct.conf 
         65types.h 
         66ifdhandler 
         67ifdproxy 
         68openct-tool 
        2669openct-control 
        27 openct-tool 

  • trunk/src/tools/Makefile.am

    r634 r1028  
    1 # Process this file with automake to create Makefile.in 
    2  
    3 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    42 
    53bin_PROGRAMS = openct-tool 
    64sbin_PROGRAMS = openct-control 
    7  
    8 EXTRA_DIST = openct-tool.1.in 
    95man1_MANS = openct-tool.1 
    10 DISTCLEANFILES = openct-tool.1 
    116 
    127openct_tool_SOURCES = openct-tool.c 
    13 openct_tool_LDADD = ../ct/libopenct.la 
     8openct_tool_LDADD = $(top_builddir)/src/ct/libopenct.la 
     9openct_tool_CFLAGS = $(AM_CFLAGS) \ 
     10        -I$(top_srcdir)/src/include \ 
     11        -I$(top_builddir)/src/include 
    1412 
    1513openct_control_SOURCES = openct-control.c 
    16 openct_control_LDADD = ../ifd/libifd.la ../ct/libopenct.la 
     14openct_control_LDADD = $(top_builddir)/src/ifd/libifd.la $(top_builddir)/src/ct/libopenct.la 
     15openct_control_CFLAGS = $(AM_CFLAGS) \ 
     16        -I$(top_srcdir)/src/include \ 
     17        -I$(top_builddir)/src/include 
Note: See TracChangeset for help on using the changeset viewer.