Changeset 3661

Show
Ignore:
Timestamp:
05/12/08 19:06:51
Author:
robtaylor
Message:
  • configure.ac: Add --with-platform option 'none'.
  • bindings/python/Makefile.am: Fix up python bindings to work when built with no platform.
  • bindings/dotnet/Makefile.am: Don't build platform subdir if platform is none.
  • tests/vala-demo/Makefile.am: Fix up vala demo to use PLATFORM_LIBS for consistency.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3656 r3661  
     12008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk> 
     2 
     3        * configure.ac: Add --with-platform option 'none'. 
     4        * bindings/python/Makefile.am: Fix up python bindings to work when built with no platform. 
     5        * bindings/dotnet/Makefile.am: Don't build platform subdir if platform is none. 
     6        * tests/vala-demo/Makefile.am: Fix up vala demo to use PLATFORM_LIBS for consistency. 
     7 
    182008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk> 
    29 

  • trunk/bindings/dotnet/Makefile.am

    r3411 r3661  
    11EXTRA_DIST = tny-sharp.snk 
    2 SUBDIRS = . tny ui ui-gtk camel platform 
     2SUBDIRS = . tny ui ui-gtk camel 
     3ifdef HAVE_PLATFORM 
     4SUBDIRS += platform 
     5endif 

  • trunk/bindings/python/Makefile.am

    r2805 r3661  
    33        -I$(top_srcdir)/libtinymail -I$(top_srcdir)/libtinymailui \ 
    44        -I$(top_srcdir)/libtinymailui-gtk -I$(top_srcdir)/libtinymail-camel \ 
    5         -I$(top_srcdir)/$(PLATFORMDIR) -I$(top_srcdir)/libtinymail-camel/camel-lite 
     5        @PLATFORM_CFLAGS@ -I$(top_srcdir)/libtinymail-camel/camel-lite 
    66 
    77common_ldflags = -module -avoid-version 
    …… 
    4747        $(TINYMAIL_PYTHON_LIBS) \ 
    4848        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la \ 
    49         $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la \ 
     49        @PLATFORM_LIBS@ \ 
    5050        $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la 
    5151camel_la_SOURCES = tinymail-camelmodule.c pytny-session-camel.c 

  • trunk/configure.ac

    r3601 r3661  
    7575PLATFORMSPECIFICNAME=Gnome 
    7676PLATFORM=1 
     77PLATFORM_LIBS='$(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la' 
     78PLATFORM_CFLAGS='-I$(top_srcdir)/$(PLATFORM)' 
     79have_platform=yes 
    7780 
    7881dnl ### Debugging ### 
    …… 
    136139        PLATFORM=4 
    137140        ;; 
     141  none) 
     142        PLATFORMDIR= 
     143        PLATFORMSPECIFICNAME= 
     144        build_uigtk=false 
     145        build_demoui=false 
     146        PLATFORM=0 
     147        PLATFORM_LIBS= 
     148        PLATFORM_CFLAGS= 
     149        have_platform=no 
     150        ;; 
    138151  *)  
    139152        PLATFORMDIR=${with_platform} 
    …… 
    148161AC_SUBST(PLATFORM) 
    149162AC_SUBST(PLATFORMSPECIFICNAME) 
     163AC_SUBST(PLATFORM_LIBS) 
     164AC_SUBST(PLATFORM_CFLAGS) 
     165 
     166AM_CONDITIONAL([HAVE_PLATFORM], [test x$have_platform = xyes]) 
    150167 
    151168dnl ### Select the html component ## 

  • trunk/tests/vala-demo/Makefile.am

    r3092 r3661  
    3838        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la   \ 
    3939        $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la   \ 
    40         $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la               \ 
     40        @PLATFORM_LIBS@                                                               \ 
    4141        $(NULL) 
    4242