diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-29 16:50:04 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-29 16:50:04 +0100 |
| commit | 443a918bd4735e674bdec300f6b8eabe8cda24e0 (patch) | |
| tree | daa1698493d2fa780e7bebaa83b4224a45556bbb | |
| parent | 12129854c64a6104ad15c96aace53b08edf64d2b (diff) | |
| download | mate-control-center-443a918bd4735e674bdec300f6b8eabe8cda24e0.tar.bz2 mate-control-center-443a918bd4735e674bdec300f6b8eabe8cda24e0.tar.xz | |
install libslab library and headers
gnome libslab is no more available, so we can ship it
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 27 | ||||
| -rw-r--r-- | libslab/Makefile.am | 13 | ||||
| -rw-r--r-- | libslab/libslab.pc.in | 12 | ||||
| -rw-r--r-- | shell/Makefile.am | 5 |
5 files changed, 25 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 288cad4a..e5160c7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = po libwindow-settings capplets font-viewer help DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break -if HAVE_LIBSLAB_DEPS +if HAVE_LIBSLAB SUBDIRS += libslab endif diff --git a/configure.ac b/configure.ac index e4d994b9..d6449610 100644 --- a/configure.ac +++ b/configure.ac @@ -152,28 +152,18 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 $GMODULE_ADD) dnl dnl Check dependencies of libslab dnl -PKG_CHECK_MODULES(EXTERNAL_LIBSLAB, [libslab], have_libslab=yes, have_libslab=no) - -if test $have_libslab = no; then - PKG_CHECK_MODULES(LIBSLAB, [ - gio-2.0 mate-desktop-2.0 librsvg-2.0 libmate-menu pango - ], - have_libslab_deps=yes, - have_libslab_deps=no) - WARN_CFLAGS="-Wall" -else - have_libslab_deps=no -fi +PKG_CHECK_MODULES(LIBSLAB, [ + gio-2.0 mate-desktop-2.0 librsvg-2.0 libmate-menu pango + ], + have_libslab=yes, + have_libslab=no) +WARN_CFLAGS="-Wall" -AC_SUBST(EXTERNAL_LIBSLAB_CFLAGS) -AC_SUBST(EXTERNAL_LIBSLAB_LIBS) AC_SUBST(LIBSLAB_CFLAGS) AC_SUBST(LIBSLAB_LIBS) AC_SUBST(WARN_CFLAGS) -AM_CONDITIONAL(HAVE_LIBSLAB, [test $have_libslab = yes -o $have_libslab_deps = yes]) -AM_CONDITIONAL(HAVE_LIBSLAB_DEPS, [test $have_libslab_deps = yes]) -AM_CONDITIONAL(LIBSLAB_FOR_INTERNAL_USE, test "yes" = "yes") +AM_CONDITIONAL(HAVE_LIBSLAB, [test $have_libslab = yes]) dnl dnl Check for Xft version 2; we build in extra functionality to the font capplet @@ -368,6 +358,7 @@ help/Makefile libwindow-settings/Makefile libwindow-settings/mate-window-settings-2.0.pc po/Makefile.in +libslab/libslab.pc libslab/Makefile shell/Makefile shell/matecc.desktop.in @@ -385,7 +376,7 @@ echo " mate-control-center Appindicator: ${enable_appindicator} - Libslab: ${have_libslab_deps} + Libslab: ${have_libslab} XCursor support: ${have_xcursor} XInput support: ${have_xinput} About-me: ${enable_aboutme} diff --git a/libslab/Makefile.am b/libslab/Makefile.am index 181d9604..f9c844fd 100644 --- a/libslab/Makefile.am +++ b/libslab/Makefile.am @@ -1,9 +1,11 @@ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libslab.pc + INCLUDES = \ -I$(top_srcdir) \ $(LIBSLAB_CFLAGS) \ $(WARN_CFLAGS) - HEADER_FILES= \ $(BUILT_SOURCES) \ app-resizer.h \ @@ -24,11 +26,7 @@ HEADER_FILES= \ system-tile.h \ tile.h -if !LIBSLAB_FOR_INTERNAL_USE lib_LTLIBRARIES = libslab.la -else -noinst_LTLIBRARIES = libslab.la -endif libslab_la_SOURCES = \ $(MARSHAL_GENERATED) \ @@ -53,13 +51,8 @@ libslab_la_SOURCES = \ tile-action.c \ tile.c -if !LIBSLAB_FOR_INTERNAL_USE libslab_includedir = $(includedir)/libslab libslab_include_HEADERS = $(HEADER_FILES) - -libslab_la_LDFLAGS = -version-info $(LT_VERSION) -endif - libslab_la_LIBADD = $(LIBSLAB_LIBS) search-entry-watermark.h: search-entry-watermark.svg diff --git a/libslab/libslab.pc.in b/libslab/libslab.pc.in new file mode 100644 index 00000000..bbc8371c --- /dev/null +++ b/libslab/libslab.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libslab +Description: Beautiful App Slab +Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-2.0 mate-desktop-2.0 libmate-menu +Requires.private: gdk-2.0 librsvg-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lslab +Cflags: -I${includedir}/libslab diff --git a/shell/Makefile.am b/shell/Makefile.am index 9ce991ba..858ffa53 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,10 +1,5 @@ -if HAVE_LIBSLAB_DEPS REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la -else -REAL_LIBSLAB_CFLAGS = $(EXTERNAL_LIBSLAB_CFLAGS) -REAL_LIBSLAB_LIBS = $(EXTERNAL_LIBSLAB_LIBS) -endif INCLUDES = \ -I$(top_srcdir) \ |