remove libmetacity-private

11 files changed, 14 insertions, 137 deletions

diff --git a/configure.ac b/configure.ac
index b08b36c1..25cff473 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 a3f87c65..0ed2ad9b 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 94670aa8..adae947f 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/libmetacity-private.pc.in b/src/libmetacity-private.pc.in
deleted file mode 100644
index c2c4ef09..00000000
--- a/src/libmetacity-private.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-libgnome_serverdir=@libexecdir@
-
-Name: libmetacity-private
-Description: Metacity internals shared 
-Requires: gtk+-3.0
-Version: @VERSION@
-Libs: -L${libdir} -lmetacity-private
-Cflags: -I${includedir}/metacity
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index 365f50be..ff7ed1c4 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 77adb609..2396b02b 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 b59e231b..c81aee76 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 6ad67410..8db9aef5 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/theme.c b/src/ui/theme.c
deleted file mode 100644
index f59a263b..00000000
--- a/src/ui/theme.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity Theme Rendering */
-
-/*
- * Copyright (C) 2001 Havoc Pennington
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file theme.c    Making Metacity look pretty
- *
- * The window decorations drawn by Metacity are described by files on disk
- * known internally as "themes" (externally as "window border themes" on
- * http://art.gnome.org/themes/metacity/ or "Metacity themes"). This file
- * contains most of the code necessary to support themes; it does not
- * contain the XML parser, which is in theme-parser.c.
- *
- * \bug This is a big file with lots of different subsystems, which might
- * be better split out into separate files.
- */
-
-/**
- * \defgroup tokenizer   The theme expression tokenizer
- *
- * Themes can use a simple expression language to represent the values of
- * things. This is the tokeniser used for that language.
- *
- * \bug We could remove almost all this code by using GScanner instead,
- * but we would also have to find every expression in every existing theme
- * we could and make sure the parse trees were the same.
- */
-
-/**
- * \defgroup parser  The theme expression parser
- *
- * Themes can use a simple expression language to represent the values of
- * things. This is the parser used for that language.
- */
-
-#include <config.h>
-#include "theme.h"
-#include "util.h"
-#include <gtk/gtk.h>
-#include <libmetacity/meta-color.h>
-#include <string.h>
-#include <stdlib.h>
-#define __USE_XOPEN
-#include <stdarg.h>
-#include <math.h>
diff --git a/src/ui/theme.h b/src/ui/theme.h
deleted file mode 100644
index 97c97af3..00000000
--- a/src/ui/theme.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity Theme Rendering */
-
-/*
- * Copyright (C) 2001 Havoc Pennington
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef THEME_H
-#define THEME_H
-
-#include <gtk/gtk.h>
-#include <libmetacity/meta-theme.h>
-
-#endif
diff --git a/src/ui/ui.c b/src/ui/ui.c
index eb25cb9f..feb91d60 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,