applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Use $(AM_V_GEN) when generating marshal files

Browse source 
And remove outdated use of $(NULL)
This commit is contained in:
Bastien Nocera 2010-09-10 11:58:34 +01:00
parent eb1e75ec6e
commit eadf35bf48
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
shell/Makefile.am
View file

@ -1,11 +1,8 @@
NULL =
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/libgnome-control-center \ -I$(top_srcdir)/libgnome-control-center \
$(GIO_CFLAGS) \ $(GIO_CFLAGS) \
$(GNOMECC_SHELL_CFLAGS) \ $(GNOMECC_SHELL_CFLAGS)
$(NULL)
bin_PROGRAMS = gnome-control-center bin_PROGRAMS = gnome-control-center
@ -13,10 +10,10 @@ MARSHAL_FILES = cc-shell-marshal.c cc-shell-marshal.h
BUILT_SOURCES = $(MARSHAL_FILES) BUILT_SOURCES = $(MARSHAL_FILES)
cc-shell-marshal.h: cc-shell-marshal.list cc-shell-marshal.h: cc-shell-marshal.list
@GLIB_GENMARSHAL@ --prefix=cc_shell_marshal $< --header > $@ $(AM_V_GEN) GLIB_GENMARSHAL@ --prefix=cc_shell_marshal $< --header > $@
cc-shell-marshal.c: cc-shell-marshal.list cc-shell-marshal.c: cc-shell-marshal.list
@GLIB_GENMARSHAL@ --prefix=cc_shell_marshal $< --body --header > $@ $(AM_V_GEN) GLIB_GENMARSHAL@ --prefix=cc_shell_marshal $< --body --header > $@
gnome_control_center_SOURCES = \ gnome_control_center_SOURCES = \
control-center.c \ control-center.c \
@ -30,14 +27,12 @@ gnome_control_center_SOURCES = \
cc-shell-item-view.h \ cc-shell-item-view.h \
cc-shell-model.c \ cc-shell-model.c \
cc-shell-model.h \ cc-shell-model.h \
$(MARSHAL_FILES) \ $(MARSHAL_FILES)
$(NULL)
gnome_control_center_LDADD = \ gnome_control_center_LDADD = \
$(top_builddir)/libgnome-control-center/libgnome-control-center.la \ $(top_builddir)/libgnome-control-center/libgnome-control-center.la \
$(GNOMECC_SHELL_LIBS) \ $(GNOMECC_SHELL_LIBS) \
$(GIO_LIBS) \ $(GIO_LIBS)
$(NULL)
gnome_control_center_LDFLAGS = -export-dynamic gnome_control_center_LDFLAGS = -export-dynamic
@ -45,8 +40,7 @@ AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DUIDIR="\"$(uidir)\"" \ -DUIDIR="\"$(uidir)\"" \
-DMENUDIR="\"$(menudir)\"" \ -DMENUDIR="\"$(menudir)\"" \
-DPANELS_DIR="\"$(PANELS_DIR)\"" \ -DPANELS_DIR="\"$(PANELS_DIR)\""
$(NULL)
menudir = $(sysconfdir)/xdg/menus menudir = $(sysconfdir)/xdg/menus
menu_DATA = gnomecc.menu menu_DATA = gnomecc.menu
@ -64,13 +58,12 @@ directory_in_files = gnomecc.directory.in
directory_DATA = $(directory_in_files:.directory.in=.directory) directory_DATA = $(directory_in_files:.directory.in=.directory)
@INTLTOOL_DIRECTORY_RULE@ @INTLTOOL_DIRECTORY_RULE@
EXTRA_DIST = \ EXTRA_DIST = \
$(ui_DATA) \ $(ui_DATA) \
gnome-control-center.desktop.in.in \ gnome-control-center.desktop.in.in \
gnomecc.directory.in \ gnomecc.directory.in \
gnomecc.menu \ gnomecc.menu \
cc-shell-marshal.list \ cc-shell-marshal.list
$(NULL)
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory