1 files changed, 47 insertions, 8 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index d3e4d8bd..5f0b5f7d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,21 +1,48 @@
-REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
-REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libmate-slab.la
-
 AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(WARN_CFLAGS) \
- $(REAL_LIBSLAB_CFLAGS) \
 $(MATECC_SHELL_CFLAGS) \
 -DMATELOCALEDIR="\"$(datadir)/locale\""
 
 bin_PROGRAMS = mate-control-center
 
 mate_control_center_SOURCES = \
- control-center.c
+ $(MARSHAL_GENERATED) \
+ app-resizer.c \
+ app-shell.c \
+ application-tile.c \
+ bookmark-agent.c \
+ control-center.c \
+ double-click-detector.c \
+ mate-utils.c \
+ libslab-utils.c \
+ nameplate-tile.c \
+ search-bar.c \
+ shell-window.c \
+ slab-mate-util.c \
+ slab-section.c \
+ themed-icon.c \
+ themed-icon.h \
+ tile-action.c \
+ tile.c \
+ application-tile.h \
+ app-resizer.h \
+ app-shell.h \
+ bookmark-agent.h \
+ double-click-detector.h \
+ libslab-utils.h \
+ mate-utils.h \
+ nameplate-tile.h \
+ search-bar.h \
+ shell-window.h \
+ slab.h \
+ slab-mate-util.h \
+ slab-section.h \
+ themed-icon.h \
+ tile.h
 
 mate_control_center_LDADD = \
- $(MATECC_SHELL_LIBS) \
- $(REAL_LIBSLAB_LIBS)
+ $(MATECC_SHELL_LIBS)
 
 sysdir = $(datadir)/applications
 sys_in_files = matecc.desktop.in
@@ -37,10 +64,22 @@ else
 $(AM_V_GEN) sed '/^# Translators/d' < $< > $@
 endif
 
+MARSHAL_GENERATED = nld-marshal.c nld-marshal.h
+
+nld-marshal.h: nld-marshal.list
+ ( @GLIB_GENMARSHAL@ --prefix=nld_marshal $(srcdir)/nld-marshal.list --header > nld-marshal.tmp \
+ && mv nld-marshal.tmp nld-marshal.h ) \
+ || ( rm -f nld-marshal.tmp && exit 1 )
+
+nld-marshal.c: nld-marshal.h
+ ( (echo '#include "nld-marshal.h"'; @GLIB_GENMARSHAL@ --prefix=nld_marshal $(srcdir)/nld-marshal.list --body) > nld-marshal.tmp \
+ && mv nld-marshal.tmp nld-marshal.c ) \
+ || ( rm -f nld-marshal.tmp && exit 1 )
+
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA = matecc.menu
 
-EXTRA_DIST = $(sys_in_files) matecc.directory.desktop.in matecc.menu
+EXTRA_DIST = $(sys_in_files) matecc.directory.desktop.in matecc.menu nld-marshal.list
 
 DISTCLEANFILES = $(sys_DATA) matecc.directory