X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=6dc3b4ac5f5b00bd3830dcc1f36c42f42f571111;hb=365c6d4c6d01dda4975dfd640099e0e4df03d7bd;hp=07203c14ee40aa513779546c1318cd196c978f16;hpb=59cb969475a4321d80719c1582ea9fd432c5b985;p=hildon diff --git a/configure.ac b/configure.ac index 07203c1..6dc3b4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -AC_INIT([Hildon gtk widgets], [2.1.31], [hildon@projects.maemo.org], [hildon]) +AC_INIT([Hildon gtk widgets], [2.1.77], [hildon@projects.maemo.org], [hildon]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AC_CONFIG_SRCDIR([src/hildon-window.h]) +AC_CONFIG_SRCDIR([hildon/hildon-window.h]) AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE @@ -25,10 +25,11 @@ AC_SUBST(API_VERSION_MAJOR) # increment current, and set revision to 0. # 5. If any interfaces have been added since the last public release, then increment age. # 6. If any interfaces have been removed since the last public release, then set age to 0. -AS_LIBTOOL(HILDON, 18, 6, 18) +AS_LIBTOOL(HILDON, 18, 7, 18) AM_INIT_AUTOMAKE AC_PROG_CC +AM_PROG_CC_C_O AM_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_AWK @@ -191,14 +192,14 @@ CFLAGS="$CFLAGS $MAEMO_CHANGES $MAEMO_GTK" # default vars for the examples # includes all the low-level flags # FIXME Add esd and gconf flags -HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/src/" -HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(API_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`" +HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/hildon/" +HILDON_OBJ_LIBS="\$(top_builddir)/hildon/libhildon-\$(API_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`" AC_SUBST(HILDON_OBJ_CFLAGS) AC_SUBST(HILDON_OBJ_LIBS) AC_CONFIG_FILES([Makefile \ - src/Makefile \ - src/hildon-version.h \ + hildon/Makefile \ + hildon/hildon-version.h \ pkgconfig/Makefile \ examples/Makefile \ pkgconfig/hildon.pc \