Permalink
Browse files

GTK3 only: keybinder-3.0

  • Loading branch information...
Ulrik Sverdrup
Ulrik Sverdrup committed May 8, 2011
1 parent eee239e commit d660531041c5c88d116dedca360f59f590274213
Showing with 24 additions and 23 deletions.
  1. +1 −1 .gitignore
  2. +4 −4 configure.ac
  3. +2 −2 examples/Makefile
  4. +14 −13 libkeybinder/Makefile.am
  5. +3 −3 libkeybinder/{keybinder.pc.in → keybinder-3.0.pc.in}
View
@@ -13,7 +13,7 @@
/install-sh
/libkeybinder/Makefile
/libkeybinder/Makefile.in
/libkeybinder/keybinder.pc
/libkeybinder/*.pc
/libtool
/ltmain.sh
/lua-keybinder/Makefile
View
@@ -1,4 +1,4 @@
AC_INIT(keybinder, 0.2.2,
AC_INIT(keybinder-3.0, 0.2.2,
[])
AC_CONFIG_SRCDIR(libkeybinder/bind.c)
AC_CONFIG_MACRO_DIR([m4])
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE([-Wno-portability])
# If library changed but is backwards-compatible: increment age
# If library changed backwards-incompatibly: reset age
m4_define([keybinder_lt_current], [0])
m4_define([keybinder_lt_revision], [1])
m4_define([keybinder_lt_revision], [0])
m4_define([keybinder_lt_age], [0])
LT_CURRENT=keybinder_lt_current
LT_REVISION=keybinder_lt_revision
@@ -60,8 +60,8 @@ AC_SUBST(LIBDIR)
dnl ****************************************************************************
dnl * GTK
dnl ****************************************************************************
gtk_version="gtk+-2.0"
PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.20])
gtk_version="gtk+-3.0"
PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0])
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
View
@@ -1,5 +1,5 @@
GTKPKG = gtk+-2.0
KEYBPKG = keybinder
GTKPKG = gtk+-3.0
KEYBPKG = keybinder-3.0
GTK_CFLAGS = $(shell pkg-config --cflags $(GTKPKG))
GTK_LDFLAGS = $(shell pkg-config --libs $(GTKPKG))
View
@@ -7,10 +7,11 @@ LIBKEYBINDER_VERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
# C library libkeybinder
#
keybinderdir = $(libdir)
keybinder_LTLIBRARIES = libkeybinder.la
libkeybinder_la_SOURCES = bind.c
libkeybinder_la_LDFLAGS = $(GTK_LIBS) -version-info $(LIBKEYBINDER_VERSION)
include_HEADERS = keybinder.h
keybinder_LTLIBRARIES = libkeybinder-3.0.la
libkeybinder_3_0_la_SOURCES = bind.c
libkeybinder_3_0_la_LDFLAGS = $(GTK_LIBS) -version-info $(LIBKEYBINDER_VERSION)
keybinder_includedir = $(pkgincludedir)
keybinder_include_HEADERS = keybinder.h
pkgconffile = $(PACKAGE).pc
@@ -30,15 +31,15 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
introspection_sources = $(libkeybinder_la_SOURCES) $(include_HEADERS)
Keybinder-0.0.gir: libkeybinder.la
Keybinder_0_0_gir_INCLUDES = GObject-2.0
Keybinder_0_0_gir_CFLAGS = $(INCLUDES)
Keybinder_0_0_gir_LIBS = libkeybinder.la
Keybinder_0_0_gir_FILES = $(introspection_sources)
Keybinder_0_0_gir_SCANNERFLAGS = --warn-all
INTROSPECTION_GIRS += Keybinder-0.0.gir
introspection_sources = $(libkeybinder_3_0_la_SOURCES) $(keybinder_include_HEADERS)
Keybinder-3.0.gir: libkeybinder-3.0.la
Keybinder_3_0_gir_INCLUDES = GObject-2.0
Keybinder_3_0_gir_CFLAGS = $(INCLUDES)
Keybinder_3_0_gir_LIBS = libkeybinder-3.0.la
Keybinder_3_0_gir_FILES = $(introspection_sources)
Keybinder_3_0_gir_SCANNERFLAGS = --warn-all
INTROSPECTION_GIRS += Keybinder-3.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
@@ -1,11 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
includedir=@includedir@/@PACKAGE@
Name: keybinder
Name: @PACKAGE@
Description: Register global keyboard shortcuts
Requires: @GTKPACKAGEDEP@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lkeybinder
Libs: -L${libdir} -lkeybinder-3.0
Cflags: -I${includedir}

0 comments on commit d660531

Please sign in to comment.