Commit 92c9962b authored by Rodrigo Moya's avatar Rodrigo Moya Committed by Rodrigo Moya

moved all to libslab.

2006-11-01  Rodrigo Moya <rodrigo@novell.com>

	* util/*:
	* libtile/*: moved all to libslab.

	* libslab/Makefile.am: added new files from libutil and libtile.

	* libslab/app-shell.c: no need to include gi18n.h, we are already getting
	GNOME's i18n headers.
parent 30df75c3
2006-11-01 Rodrigo Moya <rodrigo@novell.com>
* util/*:
* libtile/*: moved all to libslab.
* libslab/Makefile.am: added new files from libutil and libtile.
* libslab/app-shell.c: no need to include gi18n.h, we are already getting
GNOME's i18n headers.
2006-11-01 Rodney Dawes <dobey@novell.com>
* libtile/tile.c: Add an override method for the parent's clicked event
......
SUBDIRS = \
utils \
libtile \
libslab \
application-browser/etc \
application-browser/src \
......
INCLUDES = \
$(APPLICATION_BROWSER_CFLAGS) \
-I$(top_srcdir)/libtile \
-I$(top_srcdir)/libslab \
-I$(top_srcdir)/utils \
$(WARN_CFLAGS)
bin_PROGRAMS = application-browser
......@@ -12,9 +10,7 @@ application_browser_SOURCES = \
application_browser_LDADD = \
$(APPLICATION_BROWSER_LIBS) \
$(top_builddir)/libtile/libtile.la \
$(top_builddir)/libslab/libslab.la \
$(top_builddir)/utils/libutils.la
$(top_builddir)/libslab/libslab.la
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
......@@ -34,19 +34,10 @@ AM_PATH_GLIB_2_0(2.8.0,,,gobject)
COMMON_MODULES="glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0"
PKG_CHECK_MODULES(LIBUTILS, $COMMON_MODULES gnome-desktop-2.0)
AC_SUBST(LIBUTILS_CFLAGS)
AC_SUBST(LIBUTILS_LIBS)
PKG_CHECK_MODULES(GLADE, libglade-2.0)
AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS)
PKG_CHECK_MODULES(LIBTILE, [ $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango ])
AC_SUBST(LIBTILE_CFLAGS)
AC_SUBST(LIBTILE_LIBS)
PKG_CHECK_MODULES(LIBSLAB, [ $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango ])
AC_SUBST(LIBSLAB_CFLAGS)
......@@ -102,10 +93,8 @@ control-center/etc/Makefile
control-center/src/Makefile
libslab/Makefile
libslab/libslab.pc
libtile/Makefile
main-menu/etc/Makefile
main-menu/src/Makefile
utils/Makefile
patch/Makefile
po/Makefile.in
])
INCLUDES = \
$(CONTROL_CENTER_CFLAGS) \
-I$(top_srcdir)/libtile \
-I$(top_srcdir)/libslab \
-I$(top_srcdir)/utils \
$(WARN_CFLAGS)
bin_PROGRAMS = control-center
......@@ -12,9 +10,7 @@ control_center_SOURCES = \
control_center_LDADD = \
$(CONTROL_CENTER_LIBS) \
$(top_builddir)/libtile/libtile.la \
$(top_builddir)/libslab/libslab.la \
$(top_builddir)/utils/libutils.la
$(top_builddir)/libslab/libslab.la
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
INCLUDES = \
$(LIBSLAB_CFLAGS) \
-I$(top_srcdir)/libtile \
-I$(top_srcdir)/utils \
$(WARN_CFLAGS)
lib_LTLIBRARIES = libslab.la
......@@ -11,12 +9,31 @@ libslab_la_SOURCES = \
app-resizer.c \
app-shell.c \
app-shell-startup.c \
application-tile.c \
document-tile.c \
double-click-detector.c \
double-click-detector.h \
eggaccelerators.c \
eggaccelerators.h \
egg-recent-item.c \
egg-recent-item.h \
egg-recent-model.c \
egg-recent-model.h \
gnome-utils.c \
nameplate-tile.c \
recent-files.c \
recent-files.h \
search-bar.c \
search-context-picker.c \
search-entry-watermark.h \
search-entry.c \
shell-window.c \
slab-section.c
slab-gnome-util.c \
slab-section.c \
themed-icon.c \
themed-icon.h \
tile-action.c \
tile.c
libslab_includedir = $(includedir)/slab
libslab_include_HEADERS = \
......@@ -24,16 +41,20 @@ libslab_include_HEADERS = \
app-resizer.h \
app-shell.h \
app-shell-startup.h \
application-tile.h \
document-tile.h \
gnome-utils.h \
nameplate-tile.h \
search-bar.h \
search-context-picker.h \
search-entry.h \
shell-window.h \
slab-section.h
slab-gnome-util.h \
slab-section.h \
tile.h
libslab_la_LIBADD = \
$(LIBSLAB_LIBS) \
$(LIBTILE_LIBS) \
$(top_builddir)/utils/libutils.la
$(LIBSLAB_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libslab.pc
......
......@@ -23,7 +23,6 @@
#include <libgnomevfs/gnome-vfs-ops.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <glib/gi18n.h>
#include "app-shell.h"
#include "shell-window.h"
......
.deps
.libs
Makefile
Makefile.in
INCLUDES = \
$(LIBTILE_CFLAGS) \
-I$(top_srcdir)/utils \
$(WARN_CFLAGS)
lib_LTLIBRARIES = libtile.la
libtile_la_SOURCES = \
application-tile.c \
document-tile.c \
nameplate-tile.c \
tile-action.c \
tile.c
libtile_includedir = $(includedir)/tile
libtile_include_HEADERS = \
application-tile.h \
document-tile.h \
nameplate-tile.h \
tile.h
libtile_la_LIBADD = \
$(LIBTILE_LIBS) \
$(top_builddir)/utils/libutils.la
INCLUDES = \
$(MAIN_MENU_CFLAGS) \
-I$(top_srcdir)/utils \
-I$(top_srcdir)/libtile \
-I$(top_srcdir)/libslab \
$(WARN_CFLAGS)
......@@ -32,6 +30,4 @@ main_menu_SOURCES = \
main_menu_LDADD = \
$(MAIN_MENU_LIBS) \
$(GLADE_LIBS) \
$(top_builddir)/utils/libutils.la \
$(top_builddir)/libtile/libtile.la \
$(top_builddir)/libslab/libslab.la
......@@ -22,7 +22,6 @@ PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
......@@ -34,18 +33,17 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
localedir = $(libdir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
DATADIRNAME = @DATADIRNAME@
itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
install_sh = @install_sh@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
# Automake >= 1.8 provides @mkdir_p@.
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
......@@ -54,32 +52,22 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
DEFS = @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
INCLUDES = -I.. -I$(top_srcdir)/intl
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
SOURCES =
POFILES = @POFILES@
GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
$(POFILES) $(SOURCES)
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
#This Gets Replace for some reason
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o:
$(COMPILE) $<
.SUFFIXES: .po .pox .gmo .mo .msg .cat
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
......@@ -94,7 +82,7 @@ INSTOBJEXT = @INSTOBJEXT@
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
&& rm -f $@ && gencat $@ $*.msg
all: all-@USE_NLS@
......@@ -105,120 +93,98 @@ all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
install: install-exec install-data
install-exec:
install: install-data
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
$(mkdir_p) $(DESTDIR)$(itlocaledir)
if test -n "$(PO_LINGUAS)"; then \
linguas="$(PO_LINGUAS)"; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
*.gmo) destdir=$(gnulocaledir);; \
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
linguas="$(ALL_LINGUAS)"; \
fi; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
$(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $(srcdir)/$$lang.gmo as" \
"$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
if test -r $$lang.gmo.m; then \
$(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
if test -r $(srcdir)/$$lang.gmo.m ; then \
$(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
$$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $(srcdir)/$$lang.gmo.m as" \
"$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
true; \
fi; \
fi; \
done
if test "$(PACKAGE)" = "glib"; then \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
# Empty stubs to satisfy archaic automake needs
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
installcheck:
uninstall:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
if test -n "$(PO_LINGUAS)"; then \
linguas="$(PO_LINGUAS)"; \
else \
linguas="$(ALL_LINGUAS)"; \
fi; \
for lang in $$linguas; do \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
if test "$(PACKAGE)" = "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
fi
check: all $(GETTEXT_PACKAGE).pot
dvi info tags TAGS ID:
mostlyclean:
rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -fr *.o
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -f .intltool-merge-cache
clean: mostlyclean
distclean: clean
rm -f Makefile Makefile.in POTFILES
rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
rm -f Makefile Makefile.in POTFILES stamp-it
rm -f *.mo *.msg *.cat *.cat.m *.gmo
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
rm -f Makefile.in.in
distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \
extra_dists="$(EXTRA_DISTFILES)"; \
for file in $$extra_dists; do \
test -f $$file && dists="$$dists $$file"; \
test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
done; \
for file in $$dists; do \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir); \
test -f $$file || file="$(srcdir)/$$file"; \
ln $$file $(distdir) 2> /dev/null \
|| cp -p $$file $(distdir); \
done
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
if test -n "$(PO_LINGUAS)"; then \
linguas="$(PO_LINGUAS)"; \
else \
linguas="$(ALL_LINGUAS)"; \
fi; \
for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if $$result; then \
......@@ -234,28 +200,20 @@ update-po: Makefile
fi; \
fi; \
else \
echo "msgmerge for $$cat failed!"; \
echo "msgmerge for $$lang.gmo failed!"; \
rm -f $$tmpdir/$$lang.new.po; \
fi; \
done
# POTFILES is created from POTFILES.in by stripping comments, empty lines
# and Intltool tags (enclosed in square brackets), and appending a full
# relative path to them
POTFILES: POTFILES.in
( posrcprefix='$(top_srcdir)/'; \
rm -f $@-t $@ \
&& (sed -e '/^#/d' \
-e 's/^[[].*] *//' \
-e '/^[ ]*$$/d' \
-e "s@^@ $$posrcprefix@" $(srcdir)/$@.in \
| sed -e '$$!s/$$/ \\/') > $@-t \
&& chmod a-w $@-t \
&& mv $@-t $@ )
Makefile: Makefile.in.in ../config.status POTFILES
Makefile POTFILES: stamp-it
@if test ! -f $@; then \
rm -f stamp-it; \
$(MAKE) stamp-it; \
fi
stamp-it: Makefile.in.in ../config.status POTFILES.in
cd .. \
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
......
.deps
.libs
Makefile
Makefile.in
INCLUDES = \
@LIBUTILS_CFLAGS@ \
$(WARN_CFLAGS)
noinst_LTLIBRARIES = libutils.la
libutils_includedir = $(includedir)/slab
libutils_include_HEADERS = \
gnome-utils.h \
slab-gnome-util.h
libutils_la_SOURCES = \
double-click-detector.c \
double-click-detector.h \
eggaccelerators.c \
eggaccelerators.h \
egg-recent-item.c \
egg-recent-item.h \
egg-recent-model.c \
egg-recent-model.h \
gnome-utils.c \
gnome-utils.h \
recent-files.c \
recent-files.h \
slab-gnome-util.c \
slab-gnome-util.h \
themed-icon.c \
themed-icon.h
libutils_la_LIBADD = \
@LIBUTILS_LIBS@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment