Commit ec591a5d authored by Scott Reeves's avatar Scott Reeves

Remove CC from g-m-m since it's now shipped by g-c-c

svn path=/trunk/; revision=254
parent 3d793bf7
2007-04-09 Scott Reeves <sreeves@novell.com>
* configure.in
* main-menu/etc/system-items.xbel
* libslab/Makefile.am
* Makefile.am:
Fix for BNC#255943
Remove CC from g-m-m since it's now shipped by g-c-c
2007-03-29 Jim Krehl <jimmyk@novell.com>
* main-menu/src/main-menu-ui.c:
Only make tiles for local files until remote files can be handled
......
......@@ -8,8 +8,6 @@ SUBDIRS = \
libslab \
application-browser/etc \
application-browser/src \
control-center/etc \
control-center/src \
main-menu/etc \
main-menu/src \
$(NAUTILUS_DIR) \
......
AC_INIT([gnome-main-menu], [0.9.7], [])
AC_INIT([gnome-main-menu], [0.9.8], [])
AC_CONFIG_SRCDIR([.])
AC_CONFIG_HEADERS([config.h])
......@@ -62,10 +62,20 @@ PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES libpanelapplet-2.0 gnom
AC_SUBST(APPLICATION_BROWSER_CFLAGS)
AC_SUBST(APPLICATION_BROWSER_LIBS)
PKG_CHECK_MODULES(CONTROL_CENTER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ])
dnl ==============================================
dnl How to build libslab?
dnl ==============================================
ENABLE_DYNAMIC_LIBSLAB=1
AC_ARG_ENABLE(dynamic-libslab,
AC_HELP_STRING([--enable-dynamic-libslab], [Enable dynamic libslab]),
[ENABLE_DYNAMIC_LIBSLAB=1])
AC_SUBST(CONTROL_CENTER_CFLAGS)
AC_SUBST(CONTROL_CENTER_LIBS)
AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1")
dnl ==============================================
dnl End: How to build libslab?
dnl ==============================================
dnl ==============================================
dnl Gconf
......@@ -115,8 +125,6 @@ AC_OUTPUT([
Makefile
application-browser/etc/Makefile
application-browser/src/Makefile
control-center/etc/Makefile
control-center/src/Makefile
libslab/Makefile
libslab/libslab.pc
main-menu/etc/Makefile
......
......@@ -2,9 +2,35 @@ INCLUDES = \
$(LIBSLAB_CFLAGS) \
$(WARN_CFLAGS)
HEADER_FILES= \
$(BUILT_SOURCES) \
app-resizer.h \
app-shell.h \
app-shell-startup.h \
application-tile.h \
directory-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-gnome-util.h \
slab-section.h \
system-tile.h \
tile.h
if ENABLE_DYNAMIC_LIBSLAB
lib_LTLIBRARIES = libslab.la
SOURCE_HEADER_FILES=
else
noinst_LTLIBRARIES = libslab.la
SOURCE_HEADER_FILES=$(HEADER_FILES)
endif
libslab_la_SOURCES = \
$(SOURCE_HEADER_FILES) \
$(MARSHAL_GENERATED) \
app-resizer.c \
app-shell.c \
......@@ -40,32 +66,17 @@ libslab_la_SOURCES = \
tile-action.c \
tile.c
if ENABLE_DYNAMIC_LIBSLAB
libslab_includedir = $(includedir)/slab
libslab_include_HEADERS = \
$(BUILT_SOURCES) \
app-resizer.h \
app-shell.h \
app-shell-startup.h \
application-tile.h \
directory-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-gnome-util.h \
slab-section.h \
system-tile.h \
tile.h
libslab_include_HEADERS = $(HEADER_FILES)
endif
libslab_la_LIBADD = \
$(LIBSLAB_LIBS)
libslab_la_LIBADD = $(LIBSLAB_LIBS)
if ENABLE_DYNAMIC_LIBSLAB
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libslab.pc
endif
search-entry-watermark.h: search-entry-watermark.svg
echo '#define SEARCH_ENTRY_WATERMARK_SVG "\' > $@; \
......
......@@ -17,7 +17,7 @@
</metadata>
</info>
</bookmark>
<bookmark href="control-center.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
<bookmark href="gnomecc.desktop" added="2007-01-16T05:53:36Z" modified="2007-01-16T05:53:36Z" visited="2007-01-16T05:53:36Z">
<info>
<metadata owner="http://freedesktop.org">
<mime:mime-type type="application/x-desktop"/>
......
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