diff --git a/.cvsignore b/.cvsignore index 5568a9f02..bf59cae6a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -26,3 +26,4 @@ intl ABOUT-NLS COPYING intltool-* +metacity.spec diff --git a/ChangeLog b/ChangeLog index cce726ad5..08c2f9ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 7 17:07:21 2002 Jonathan Blandford + + * src/libmetacity-private.pc.in: add a pc file for + libmetacity-private + + * src/Makefile.am: Install a few files as a shared library so that + others can draw metacity themes. + 2002-11-06 Havoc Pennington * src/keybindings.c (grab_keys): push an error trap around the diff --git a/configure.in b/configure.in index ecde2b0a3..0316cacca 100644 --- a/configure.in +++ b/configure.in @@ -242,6 +242,7 @@ AC_OUTPUT([ Makefile src/Makefile src/wm-tester/Makefile +src/libmetacity-private.pc src/tools/Makefile src/themes/Makefile po/Makefile.in diff --git a/src/.cvsignore b/src/.cvsignore index 882ef49cb..4478a102a 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -9,3 +9,4 @@ testgradient inlinepixbufs.h metacity.desktop metacity.schemas +libmetacity-private.pc diff --git a/src/Makefile.am b/src/Makefile.am index c39d6c679..6e005f25c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ +lib_LTLIBRARIES = libmetacity-private.la SUBDIRS=wm-tester tools themes @@ -80,7 +81,7 @@ metacity_SOURCES= \ xprops.h \ $(EGGFILES) -metacity_theme_viewer_SOURCES= \ +libmetacity_private_la_SOURCES= \ gradient.c \ gradient.h \ preview-widget.c \ @@ -89,10 +90,21 @@ metacity_theme_viewer_SOURCES= \ theme.h \ theme-parser.c \ theme-parser.h \ - theme-viewer.c \ util.c \ util.h +libmetacityincludedir = $(includedir)/metacity-1/metacity-private + +libmetacityinclude_HEADERS = \ + gradient.h \ + preview-widget.h \ + theme.h \ + theme-parser.h \ + util.h + +metacity_theme_viewer_SOURCES= \ + theme-viewer.c + metacity_dialog_SOURCES= \ metacity-dialog.c @@ -100,7 +112,7 @@ bin_PROGRAMS=metacity metacity-theme-viewer libexec_PROGRAMS=metacity-dialog metacity_LDADD= @METACITY_LIBS@ -metacity_theme_viewer_LDADD= @METACITY_LIBS@ +metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la metacity_dialog_LDADD=@METACITY_LIBS@ testgradient_SOURCES=gradient.h gradient.c testgradient.c @@ -137,7 +149,17 @@ CLEANFILES = inlinepixbufs.h inlinepixbufs.h: $(IMAGES) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h -EXTRA_DIST=$(desktopfiles_DATA) $(IMAGES) $(schema_DATA) update-from-egg.sh $(desktopfiles_in_files) $(schema_in_files) +pkgconfigdir = $(libdir)/pkgconfig + +pkgconfig_DATA = libmetacity-private.pc + +EXTRA_DIST=$(desktopfiles_DATA) \ + $(IMAGES) $(schema_DATA) \ + update-from-egg.sh \ + $(desktopfiles_in_files) \ + $(schema_in_files) \ + libmetacity-private.pc.in + EGGDIR=$(srcdir)/../../libegg/libegg diff --git a/src/libmetacity-private.pc.in b/src/libmetacity-private.pc.in new file mode 100644 index 000000000..3f034b625 --- /dev/null +++ b/src/libmetacity-private.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +libgnome_serverdir=@libexecdir@ + +Name: libmetacity-private +Description: Metacity internals shared +Requires: gtk+-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lmetacity-private +Cflags: -I${includedir}/metacity-1