Changeset 1025

Show
Ignore:
Timestamp:
04/04/08 21:02:44 (8 months ago)
Author:
alonbl
Message:

Fix separate builddir issues

Location:
branches/alonbl/build
Files:
17 modified

Legend:

Unmodified
Added
Removed

  • branches/alonbl/build/Makefile.am

    r1019 r1025  
    33 
    44MAINTAINERCLEANFILES = \ 
    5         Makefile.in config.h.in config.h.in~ configure \ 
    6         install-sh ltmain.sh missing mkinstalldirs \ 
    7         compile depcomp config.log config.status \ 
    8         config.guess config.sub acinclude.m4 aclocal.m4 \ 
    9         packaged 
     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 
    1012EXTRA_DIST = svnignore 
    1113 

  • branches/alonbl/build/aclocal/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33dist_noinst_DATA = ac_create_stdint_h.m4 \ 

  • branches/alonbl/build/aclocal/ac_create_stdint_h.m4

    r1015 r1025  
    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)` 
    … …  
    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 

  • branches/alonbl/build/configure.ac

    r1024 r1025  
    148148                fi 
    149149        ], 
    150         [bundledir="no"] 
     150        [bundledir=""] 
    151151) 
    152152 
    … …  
    161161                fi 
    162162        ], 
    163         [udevdir="no"] 
     163        [udevdir=""] 
    164164) 
    165165 
    … …  
    174174                fi 
    175175        ], 
    176         [hotplugdir="no"] 
    177 ) 
    178  
    179 AC_ARG_ENABLE( 
     176        [hotplugdir=""] 
     177) 
     178 
     179AC_ARG_WITH( 
    180180        [ifddir], 
    181181        [AC_HELP_STRING([--with-ifddir], [ifd directory. @<:@/usr/lib/ifd@:>@])], 
    … …  
    403403AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"]) 
    404404AM_CONDITIONAL([ENABLE_API_DOC], [test "${enable_api_doc}" = "yes"]) 
    405 AM_CONDITIONAL([ENABLE_BUNDLES], [test "${bundledir}" != "no"]) 
    406 AM_CONDITIONAL([ENABLE_UDEV], [test "${udevdir}" != "no"]) 
    407 AM_CONDITIONAL([ENABLE_HOTPLUG], [test "${hotplugdir}" != "no"]) 
     405AM_CONDITIONAL([ENABLE_BUNDLES], [test -n "${bundledir}"]) 
     406AM_CONDITIONAL([ENABLE_UDEV], [test -n "${udevdir}"]) 
     407AM_CONDITIONAL([ENABLE_HOTPLUG], [test -n "${hotplugdir}"]) 
    408408AM_CONDITIONAL([ENABLE_PCSC], [test "${enable_pcsc}" = "yes"]) 
    409409 

  • branches/alonbl/build/doc/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33if ENABLE_DOC 
    … …  
    77 
    88dist_doc_DATA = README 
    9 dist_noinst_DATA = doxygen-footer.html *.gif 
     9dist_noinst_DATA = $(srcdir)/doxygen-footer.html $(srcdir)/*.gif 
    1010 
    1111if ENABLE_API_DOC 
    … …  
    1515 
    1616api.out/html/*: \ 
    17                 ../src/include/openct/*.h \ 
    18                 doxygen.conf \ 
    19                 *.gif 
     17                $(top_srcdir)/src/include/openct/*.h \ 
     18                $(srcdir)/*.gif \ 
     19                doxygen.conf 
    2020        -rm -fr api.out 
    2121        $(DOXYGEN) doxygen.conf 
    22         cp *.gif api.out/html 
     22        cp "$(srcdir)"/*.gif api.out/html 
    2323 
    2424endif 

  • branches/alonbl/build/doc/doxygen.conf.in

    r1015 r1025  
    114114# path to strip. 
    115115 
    116 STRIP_FROM_PATH        = ../src/include 
     116STRIP_FROM_PATH        = @top_srcdir@/src/include 
    117117 
    118118# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of  
    … …  
    494494# with spaces. 
    495495 
    496 INPUT                  = ../src/include 
     496INPUT                  = @top_srcdir@/src/include 
    497497 
    498498# This tag can be used to specify the character encoding of the source files that  
    … …  
    707707# standard footer. 
    708708 
    709 HTML_FOOTER            = doxygen-footer.html 
     709HTML_FOOTER            = @srcdir@/doxygen-footer.html 
    710710 
    711711# The HTML_STYLESHEET tag can be used to specify a user-defined cascading  

  • branches/alonbl/build/doc/nonpersistent/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in ChangeLog ChangeLog.tmp 
     1MAINTAINERCLEANFILES = \ 
     2        $(srcdir)/Makefile.in $(srcdir)/ChangeLog 
     3DISTCLEANFILES = \ 
     4        ChangeLog ChangeLog.tmp  
    25 
    36wikidir=$(htmldir)/wiki 
    … …  
    1417        WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \ 
    1518                PROJECT="@PACKAGE_NAME@" \ 
    16                 $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "$(srcdir)/wiki.tmp" 
     19                $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "wiki.tmp" 
    1720        mv wiki.tmp wiki.out 
    1821 
    1922ChangeLog: 
    2023        test -n "$(SVN)" -a -n "$(XSLTPROC)" 
    21         if test -d .svn; then \ 
     24        if test -d "$(top_srcdir)/.svn"; then \ 
    2225                $(SVN) --verbose --xml log "$(top_srcdir)" | \ 
    2326                        $(XSLTPROC) --nonet --stringparam linelen 75 \ 
    … …  
    3134        mv ChangeLog.tmp ChangeLog 
    3235 
     36else 
     37 
     38wiki.out/*: 
     39        $(LN_S) "$(srcdir)/wiki.out" wiki.out 
     40 
     41ChangeLog: 
     42        $(LN_S) "$(srcdir)/ChangeLog" ChangeLog 
     43 
    3344endif 
    3445 
     46distclean-local: 
     47        rm -rf wiki.out wiki.tmp 
     48 
    3549maintainer-clean-local: 
    36         rm -rf wiki.out wiki.tmp 
     50        rm -rf "$(srcdir)/wiki.out" 

  • branches/alonbl/build/etc/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33CLEANFILES = openct.conf init-script openct.hald reader.conf \ 

  • branches/alonbl/build/macos/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33dist_noinst_SCRIPTS = libtool-bundle 

  • branches/alonbl/build/src/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33# Order IS important 

  • branches/alonbl/build/src/ct/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33lib_LTLIBRARIES = libopenct.la 
    … …  
    77        buffer.c client.c error.c mainloop.c path.c \ 
    88        socket.c status.c tlv.c 
    9 libopenct_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include 
     9libopenct_la_CFLAGS = $(AM_CFLAGS) \ 
     10        -I$(top_srcdir)/src/include \ 
     11        -I$(top_builddir)/src/include 
    1012libopenct_la_LDFLAGS = \ 
    1113        -version-info @OPENCT_LT_CURRENT@:@OPENCT_LT_REVISION@:@OPENCT_LT_AGE@ \ 

  • branches/alonbl/build/src/ctapi/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33openctinclude_HEADERS = ctapi.h 
    … …  
    55 
    66libopenctapi_la_SOURCES = ctapi.c ctapi.h 
    7 libopenctapi_la_LIBADD = $(top_srcdir)/src/ct/libopenct.la 
    8 libopenctapi_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include 
     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 
    911libopenctapi_la_LDFLAGS = -avoid-version -no-undefined --module 

  • branches/alonbl/build/src/ifd/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33noinst_LTLIBRARIES = libifd.la 
    … …  
    2323        ria.c 
    2424# new driver not working yet: ifd-wbeiuu.c 
    25 libifd_la_LIBADD = $(top_srcdir)/src/ct/libopenct.la $(LTLIB_LIBS) $(OPTIONAL_LIBUSB_LIBS) 
    26 libifd_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include \ 
     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 \ 
    2729        $(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_LIBUSB_CFLAGS) $(LTLIB_CFLAGS) 
    2830 
    2931ifdhandler_SOURCES = ifdhandler.c 
    3032ifdhandler_LDADD = libifd.la 
    31 ifdhandler_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include 
     33ifdhandler_CFLAGS = $(AM_CFLAGS) \ 
     34        -I$(top_srcdir)/src/include \ 
     35        -I$(top_builddir)/src/include 
    3236 
    3337ifdproxy_SOURCES = ifdproxy.c ria-device.c ria-server.c 
    3438ifdproxy_LDADD = libifd.la 
    35 ifdproxy_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include 
     39ifdproxy_CFLAGS = $(AM_CFLAGS) \ 
     40        -I$(top_srcdir)/src/include \ 
     41        -I$(top_builddir)/src/include 

  • branches/alonbl/build/src/include/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33SUBDIRS = openct 

  • branches/alonbl/build/src/include/openct/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22DISTCLEANFILES = types.h 
    33 
    … …  
    55        apdu.h buffer.h conf.h device.h driver.h error.h ifd.h \ 
    66        logging.h openct.h path.h protocol.h server.h socket.h tlv.h  
    7 nodist_openctinclude_HEADERS = types.h 
     7nodist_openctinclude_HEADERS = $(builddir)/types.h 

  • branches/alonbl/build/src/pcsc/Makefile.am

    r1016 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33if ENABLE_PCSC 
    … …  
    77openct_ifd_la_SOURCES = pcsc.c 
    88openct_ifd_la_LDFLAGS = -module -avoid-version -no-undefined 
    9 openct_ifd_la_LIBADD = $(PCSC_LIBS) $(top_srcdir)/src/ctapi/libopenctapi.la 
    10 openct_ifd_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include -I$(top_srcdir)/src/ctapi \ 
     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 \ 
    1114        $(PCSC_CFLAGS) 
    1215 

  • branches/alonbl/build/src/tools/Makefile.am

    r1015 r1025  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33bin_PROGRAMS = openct-tool 
    … …  
    66 
    77openct_tool_SOURCES = openct-tool.c 
    8 openct_tool_LDADD = $(top_srcdir)/src/ct/libopenct.la 
    9 openct_tool_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include 
     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 
    1012 
    1113openct_control_SOURCES = openct-control.c 
    12 openct_control_LDADD = $(top_srcdir)/src/ifd/libifd.la $(top_srcdir)/src/ct/libopenct.la 
    13 openct_control_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/include 
     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