[metacity] remove libmetacity-private

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 0199de420137ed426603818e4a5b2eafeae3aab1
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Feb 4 00:52:13 2016 +0200

    remove libmetacity-private

 configure.ac                  |    1 -
 po/POTFILES.in                |    1 -
 src/Makefile.am               |   38 ++++++------------------
 src/libmetacity-private.pc.in |   12 --------
 src/ui/draw-workspace.c       |    2 +-
 src/ui/frames.h               |    2 +-
 src/ui/preview-widget.h       |    2 +-
 src/ui/theme-viewer.c         |    1 -
 src/ui/theme.c                |   62 -----------------------------------------
 src/ui/theme.h                |   28 ------------------
 src/ui/ui.c                   |    2 +-
 11 files changed, 14 insertions(+), 137 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b08b36c..25cff47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,7 +439,6 @@ AC_CONFIG_FILES([
   libmetacity/Makefile
 
   src/Makefile
-  src/libmetacity-private.pc
   src/tools/Makefile
   src/themes/Makefile
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a3f87c6..0ed2ad9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,5 +34,4 @@ src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
-src/ui/theme.c
 src/ui/theme-viewer.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 94670aa..adae947 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-lib_LTLIBRARIES = libmetacity-private.la
-
 SUBDIRS = tools themes
 
 AM_CPPFLAGS = \
@@ -25,6 +23,11 @@ metacity_SOURCES=                            \
        core/atomnames.h                        \
        core/bell.c                             \
        core/bell.h                             \
+       core/boxes.c                            \
+       include/boxes.h                         \
+       core/util.c                             \
+       include/util.h                          \
+       include/common.h                        \
        compositor/compositor.c                 \
        compositor/compositor-private.h         \
        compositor/compositor-xrender.c         \
@@ -107,10 +110,7 @@ metacity_SOURCES=                          \
        ui/ui.c                                 \
        $(NULL)
 
-# by setting libmetacity_private_la_CFLAGS, the files shared with
-# metacity proper will be compiled with different names.
-libmetacity_private_la_CFLAGS =
-libmetacity_private_la_SOURCES =               \
+metacity_theme_viewer_SOURCES=  \
        core/boxes.c                            \
        include/boxes.h                         \
        core/util.c                             \
@@ -118,21 +118,9 @@ libmetacity_private_la_SOURCES =           \
        include/common.h                        \
        ui/preview-widget.c                     \
        ui/preview-widget.h                     \
-       ui/theme.c                              \
-       ui/theme.h                              \
+       ui/theme-viewer.c                       \
        $(NULL)
 
-libmetacity_private_la_LDFLAGS = -no-undefined -version-info 4:0:0 $(WARN_LDFLAGS) $(AM_LDFLAGS)
-libmetacity_private_la_LIBADD  = @METACITY_LIBS@ $(top_builddir)/libmetacity/libmetacity.la
-
-libmetacityincludedir = $(includedir)/metacity/metacity-private
-
-libmetacityinclude_HEADERS =                   \
-       ui/theme.h
-
-metacity_theme_viewer_SOURCES=  \
-       ui/theme-viewer.c
-
 gsettings_SCHEMAS = org.gnome.metacity.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
@@ -142,8 +130,8 @@ convert_DATA = metacity-schemas.convert
 
 bin_PROGRAMS=metacity metacity-theme-viewer
 
-metacity_LDADD= METACITY_LIBS@ libmetacity-private.la $(top_builddir)/libmetacity/libmetacity.la
-metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la 
$(top_builddir)/libmetacity/libmetacity.la
+metacity_LDADD= METACITY_LIBS@ $(top_builddir)/libmetacity/libmetacity.la
+metacity_theme_viewer_LDADD= @METACITY_LIBS@ $(top_builddir)/libmetacity/libmetacity.la
 
 testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
 testgradient_SOURCES=../libmetacity/meta-gradient.h ../libmetacity/meta-gradient.c ui/testgradient.c
@@ -180,18 +168,12 @@ xml_DATA     = $(xml_in_files:.xml.in=.xml)
 CLEANFILES = \
        metacity.desktop metacity-wm.desktop org.gnome.metacity.gschema.xml 50-metacity-launchers.xml 
50-metacity-navigation.xml 50-metacity-screenshot.xml 50-metacity-system.xml 50-metacity-windows.xml
 
-pkgconfigdir = $(libdir)/pkgconfig
-
-pkgconfig_DATA = libmetacity-private.pc
-
 EXTRA_DIST=$(desktopfiles_files)               \
        $(wmproperties_files)                   \
-       $(IMAGES)                               \
        $(desktopfiles_in_files)                \
        $(wmproperties_in_files)                \
        metacity-schemas.convert                \
        org.gnome.metacity.gschema.xml.in       \
-       $(xml_in_files)                         \
-       libmetacity-private.pc.in
+       $(xml_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index 365f50b..ff7ed1c 100644
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -26,9 +26,9 @@
 #include "config.h"
 
 #include <libmetacity/meta-color.h>
+#include <libmetacity/meta-theme.h>
 
 #include "draw-workspace.h"
-#include "theme.h"
 
 static void
 get_window_rect (const WnckWindowDisplayInfo *win,
diff --git a/src/ui/frames.h b/src/ui/frames.h
index 77adb60..2396b02 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <libmetacity/meta-theme.h>
 #include "common.h"
-#include "theme.h"
 
 typedef enum
 {
diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h
index b59e231..c81aee7 100644
--- a/src/ui/preview-widget.h
+++ b/src/ui/preview-widget.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "theme.h"
 #include <gtk/gtk.h>
+#include <libmetacity/meta-theme.h>
 
 #ifndef META_PREVIEW_WIDGET_H
 #define META_PREVIEW_WIDGET_H
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 6ad6741..8db9aef 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include "util.h"
-#include "theme.h"
 #include "preview-widget.h"
 #include <gtk/gtk.h>
 #include <time.h>
diff --git a/src/ui/ui.c b/src/ui/ui.c
index eb25cb9..feb91d6 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -25,11 +25,11 @@
 #include "util.h"
 #include "menu.h"
 #include "core.h"
-#include "theme.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <cairo-xlib.h>
+#include <libmetacity/meta-theme.h>
 
 static void meta_ui_accelerator_parse (const char      *accel,
                                        guint           *keysym,