[metacity] libmetacity: make public
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] libmetacity: make public
- Date: Thu, 28 Jan 2016 16:10:18 +0000 (UTC)
commit b0e967fb94ef55cb79ee7df7f2926d747ad2ed2a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Thu Jan 28 12:39:44 2016 +0200
libmetacity: make public
Makefile.am | 1 +
configure.ac | 4 ++++
data/Makefile.am | 7 +++++++
data/pkgconfig/Makefile.am | 14 ++++++++++++++
data/pkgconfig/libmetacity.pc.in | 11 +++++++++++
libmetacity/Makefile.am | 14 +++++++++++++-
src/Makefile.am | 2 +-
7 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bac7932..4903767 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
NULL =
SUBDIRS = \
+ data \
libmetacity \
doc \
src \
diff --git a/configure.ac b/configure.ac
index 2dccf27..3e29fa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,6 +422,10 @@ dnl **************************************************************************
AC_CONFIG_FILES([
Makefile
+ data/Makefile
+ data/pkgconfig/Makefile
+ data/pkgconfig/libmetacity.pc
+
doc/Makefile
doc/creating_themes/Makefile
doc/man/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..fa95971
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,7 @@
+NULL =
+
+SUBDIRS = \
+ pkgconfig \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/pkgconfig/Makefile.am b/data/pkgconfig/Makefile.am
new file mode 100644
index 0000000..53993b6
--- /dev/null
+++ b/data/pkgconfig/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmetacity.pc
+
+EXTRA_DIST = \
+ libmetacity.pc.in \
+ $(NULL)
+
+CLEANFILES = \
+ $(pkgconfig_DATA) \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/pkgconfig/libmetacity.pc.in b/data/pkgconfig/libmetacity.pc.in
new file mode 100644
index 0000000..779dc98
--- /dev/null
+++ b/data/pkgconfig/libmetacity.pc.in
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libmetacity
+Description: Metacity library
+Requires: glib-2.0 gtk+-3.0
+Version: @VERSION@
+Libs: -L${libdir} -lmetacity
+Cflags: -I${includedir}/metacity
diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index e852d0e..1f82c1d 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-noinst_LTLIBRARIES = libmetacity.la
+lib_LTLIBRARIES = libmetacity.la
libmetacity_la_SOURCES = \
meta-color.c \
@@ -45,4 +45,16 @@ libmetacity_la_LIBADD = \
$(LIBMETACITY_LIBS) \
$(NULL)
+libmetacity_includedir = $(includedir)/metacity/libmetacity
+libmetacity_include_HEADERS = \
+ meta-color.h \
+ meta-color-spec.h \
+ meta-gradient.h \
+ meta-gradient-spec.h \
+ meta-theme.h \
+ meta-theme-gtk.h \
+ meta-theme-impl.h \
+ meta-theme-metacity.h \
+ $(NULL)
+
-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 07bf747..b99492f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,7 +145,7 @@ convert_DATA = metacity-schemas.convert
bin_PROGRAMS=metacity metacity-theme-viewer
-metacity_LDADD= METACITY_LIBS@ libmetacity-private.la
+metacity_LDADD= METACITY_LIBS@ libmetacity-private.la $(top_builddir)/libmetacity/libmetacity.la
metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]