Commit 24e4598f authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin

cleanup enums and marshallers generation.

2001-11-27  Mark McLoughlin  <mark@skynet.ie>

        * Makefile.am: cleanup enums and marshallers generation.

        * panel-marshal-main.c: remove.

2001-11-27  Mark McLoughlin  <mark@skynet.ie>

        * Makefile.am: include panel-applet-marshal.h in
          panel-applet-marshal.c. Not a very pretty hack.

2001-11-27  Mark McLoughlin  <mark@skynet.ie>

        * Makefile.am: remove empty SUBDIRS.
parent 68b02f70
2001-11-27 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: remove empty SUBDIRS.
2001-11-27 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: build against ../../libpanel-applet.
......
......@@ -9,8 +9,6 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(PANEL_CFLAGS)
SUBDIRS =
EXTRA_SUBDIRS = help
bin_PROGRAMS = fish-applet-2
......
2001-11-27 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: cleanup enums and marshallers generation.
* panel-marshal-main.c: remove.
2001-11-27 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: rename binary to gnome-panel-2.
......
......@@ -66,7 +66,8 @@ BUILT_SOURCES = \
panel_sources = \
panel-typebuiltins.c \
panel-typebuiltins.h \
panel-marshal-main.c \
panel-marshal.c \
panel-marshal.h \
main.c \
panel-widget.c \
basep-widget.c \
......@@ -193,32 +194,23 @@ sys_DATA = gnome-panel-properties.desktop
deskdir = $(datadir)/gnome/apps/Settings/Desktop/
desk_DATA = gnome-panel-properties.desktop
$(srcdir)/panel-util.c: $(CORBA_SRCLIST)
panel_enum_headers = \
panel-types.h \
panel-widget.h \
basep-widget.h \
aligned-widget.h \
sliding-widget.h \
GNOME_Panel.h
$(srcdir)/panel-marshal.h: panel-marshal.list
cd $(srcdir) \
&& glib-genmarshal --prefix=panel_marshal panel-marshal.list --header >> xgen-gmh \
&& (cmp -s xgen-gmh panel-marshal.h || cp xgen-gmh panel-marshal.h) \
&& rm -f xgen-gmh xgen-gmh~
$(srcdir)/panel-marshal.c: panel-marshal.list
cd $(srcdir) \
&& glib-genmarshal --prefix=panel_marshal panel-marshal.list --body >> xgen-gmc \
&& (cp xgen-gmc panel-marshal.c || cp xgen-gmc panel-marshal.c) \
&& rm -f xgen-gmc xgen-gmc~
$(srcdir)/panel-typebuiltins.c: @REBUILD@ Makefile.am $(panel_enum_headers)
cd $(srcdir) \
&& glib-mkenums \
--fhead "#include <glib-object.h>\n" \
panel_enum_headers = \
$(top_srcdir)/panel/panel-types.h \
$(top_srcdir)/panel/panel-widget.h \
$(top_srcdir)/panel/basep-widget.h \
$(top_srcdir)/panel/aligned-widget.h \
$(top_srcdir)/panel/sliding-widget.h \
$(top_builddir)/panel/GNOME_Panel.h
panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
echo "#include \"panel-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
glib-mkenums --fhead "#include <glib-object.h>\n" \
--fhead "#include \"panel-typebuiltins.h\"\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--fprod "\n#include \"@filename@\"\n" \
......@@ -230,14 +222,10 @@ $(srcdir)/panel-typebuiltins.c: @REBUILD@ Makefile.am $(panel_enum_headers)
--vtail " if (!type)\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(panel_enum_headers) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
$(srcdir)/panel-typebuiltins.h: @REBUILD@ Makefile.am $(panel_enum_headers)
cd $(srcdir) \
&& glib-mkenums \
--fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
$(panel_enum_headers) > $@
panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
glib-mkenums --fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
--fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
......@@ -245,9 +233,7 @@ $(srcdir)/panel-typebuiltins.h: @REBUILD@ Makefile.am $(panel_enum_headers)
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define PANEL_TYPE_@ENUMNAME@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(panel_enum_headers) > xgen-gth \
&& cp xgen-gth $(@F) \
&& rm -f xgen-gth
$(panel_enum_headers) > $@
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = panelglobalconfig.schema
......
#include <glib-object.h>
#include "panel-marshal.h"
#include "panel-marshal.c"
2001-11-27 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: include panel-applet-marshal.h in
panel-applet-marshal.c. Not a very pretty hack.
2001-11-27 Mark McLoughlin <mark@skynet.ie>
* *.*: Move from $(top_srcdir)/panel.
......
......@@ -74,9 +74,10 @@ panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
panel-applet-marshal.c: panel-applet-marshal.list $(GLIB_GENMARSHAL)
echo "#include \"panel-applet-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=panel_applet_marshal > $@
panel_applet_enum_headers = panel-applet.h
panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
glib-mkenums --fhead "#include <glib-object.h>\n" \
......
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