jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate the marshal files automatically. We shouldn't be doing it by hand.

This commit is contained in:
Christian Hammond 2006-01-09 19:14:10 +00:00
parent fb513c854d
commit 1ea5eae50a
8 changed files with 70 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Mon Jan 09 11:13:15 PST 2006 Christian Hammond <chipx86@chipx86.com>
* libnotify/Makefile.am:
* libnotify/Makefile.in:
A libnotify/notify-marshal.list:
D libnotify/notifymarshal.c:
D libnotify/notifymarshal.h:
* libnotify/notifynotification.c:
* configure.ac:
- Generate the marshal files automatically. We shouldn't be doing it
by hand.
Mon Jan 09 10:15:57 PST 2006 Christian Hammond <chipx86@chipx86.com> Mon Jan 09 10:15:57 PST 2006 Christian Hammond <chipx86@chipx86.com>
* libnotify/Makefile.in: * libnotify/Makefile.in:

3
configure.ac
View File

@ -107,6 +107,9 @@ AM_CONDITIONAL(HAVE_GDK, test "x$have_gdk" = "xyes")
AC_SUBST(GDK_CFLAGS) AC_SUBST(GDK_CFLAGS)
AC_SUBST(GDK_LIBS) AC_SUBST(GDK_LIBS)
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
dnl dnl
dnl Check the D-BUS version. dnl Check the D-BUS version.
dnl dnl

26
libnotify/Makefile.am
View File

@ -1,18 +1,23 @@
notifyincdir = $(includedir)/libnotify notifyincdir = $(includedir)/libnotify
MARSHAL_PREFIX = notify_marshal
MARSHAL_FILE = notify-marshal
lib_LTLIBRARIES = libnotify.la lib_LTLIBRARIES = libnotify.la
notifyinc_HEADERS = \ notifyinc_HEADERS = \
notify.h \ notify.h \
notifynotification.h \ notifynotification.h \
notifycommon.h \ notifycommon.h
notifymarshal.h
noinst_HEADERS = \
notify-marshal.h
libnotify_la_SOURCES = \ libnotify_la_SOURCES = \
dbus-compat.h \ dbus-compat.h \
notify.c \ notify.c \
notifynotification.c \ notifynotification.c \
notifymarshal.c notify-marshal.c
libnotify_la_LIBADD = \ libnotify_la_LIBADD = \
$(PACKAGE_LIBS) $(PACKAGE_LIBS)
@ -20,5 +25,20 @@ libnotify_la_LIBADD = \
libnotify_la_LDFLAGS = \ libnotify_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
notify-marshal.h: notify-marshal.list
$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) notify-marshal.list \
--header > notify-marshal.h
notify-marshal.c: notify-marshal.list
$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) notify-marshal.list \
--body > notify-marshal.c
EXTRA_DIST = \
notify-marshal.list
CLEANFILES = \
notify-marshal.c \
notify-marshal.h
INCLUDES = \ INCLUDES = \
$(PACKAGE_CFLAGS) $(PACKAGE_CFLAGS)

37
libnotify/Makefile.in
View File

@ -40,8 +40,8 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
subdir = libnotify subdir = libnotify
DIST_COMMON = $(notifyinc_HEADERS) $(srcdir)/Makefile.am \ DIST_COMMON = $(noinst_HEADERS) $(notifyinc_HEADERS) \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -61,7 +61,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
libnotify_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libnotify_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libnotify_la_OBJECTS = notify.lo notifynotification.lo \ am_libnotify_la_OBJECTS = notify.lo notifynotification.lo \
notifymarshal.lo notify-marshal.lo
libnotify_la_OBJECTS = $(am_libnotify_la_OBJECTS) libnotify_la_OBJECTS = $(am_libnotify_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
@ -77,7 +77,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
SOURCES = $(libnotify_la_SOURCES) SOURCES = $(libnotify_la_SOURCES)
DIST_SOURCES = $(libnotify_la_SOURCES) DIST_SOURCES = $(libnotify_la_SOURCES)
notifyincHEADERS_INSTALL = $(INSTALL_HEADER) notifyincHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(notifyinc_HEADERS) HEADERS = $(noinst_HEADERS) $(notifyinc_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -112,6 +112,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@ FFLAGS = @FFLAGS@
GDK_CFLAGS = @GDK_CFLAGS@ GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@ GDK_LIBS = @GDK_LIBS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
HAVE_GDK_FALSE = @HAVE_GDK_FALSE@ HAVE_GDK_FALSE = @HAVE_GDK_FALSE@
HAVE_GDK_TRUE = @HAVE_GDK_TRUE@ HAVE_GDK_TRUE = @HAVE_GDK_TRUE@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
@ -190,18 +191,22 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
notifyincdir = $(includedir)/libnotify notifyincdir = $(includedir)/libnotify
MARSHAL_PREFIX = notify_marshal
MARSHAL_FILE = notify-marshal
lib_LTLIBRARIES = libnotify.la lib_LTLIBRARIES = libnotify.la
notifyinc_HEADERS = \ notifyinc_HEADERS = \
notify.h \ notify.h \
notifynotification.h \ notifynotification.h \
notifycommon.h \ notifycommon.h
notifymarshal.h
noinst_HEADERS = \
notify-marshal.h
libnotify_la_SOURCES = \ libnotify_la_SOURCES = \
dbus-compat.h \ dbus-compat.h \
notify.c \ notify.c \
notifynotification.c \ notifynotification.c \
notifymarshal.c notify-marshal.c
libnotify_la_LIBADD = \ libnotify_la_LIBADD = \
$(PACKAGE_LIBS) $(PACKAGE_LIBS)
@ -209,6 +214,13 @@ libnotify_la_LIBADD = \
libnotify_la_LDFLAGS = \ libnotify_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
EXTRA_DIST = \
notify-marshal.list
CLEANFILES = \
notify-marshal.c \
notify-marshal.h
INCLUDES = \ INCLUDES = \
$(PACKAGE_CFLAGS) $(PACKAGE_CFLAGS)
@ -281,8 +293,8 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify-marshal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifymarshal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifynotification.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notifynotification.Plo@am__quote@
.c.o: .c.o:
@ -432,6 +444,7 @@ install-strip:
mostlyclean-generic: mostlyclean-generic:
clean-generic: clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic: distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -505,6 +518,14 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-info-am uninstall-libLTLIBRARIES \
uninstall-notifyincHEADERS uninstall-notifyincHEADERS
notify-marshal.h: notify-marshal.list
$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) notify-marshal.list \
--header > notify-marshal.h
notify-marshal.c: notify-marshal.list
$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) notify-marshal.list \
--body > notify-marshal.c
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

1
libnotify/notify-marshal.list Normal file
View File

@ -0,0 +1 @@
VOID:UINT,STRING

56
libnotify/notifymarshal.c
View File

@ -1,56 +0,0 @@
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to:
* The Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "notifymarshal.h"
void
_notify_marshal_VOID__UINT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__UINT_STRING) (gpointer data1,
gpointer arg_1,
gpointer arg_2,
gpointer data2);
register GMarshalFunc_VOID__UINT_STRING callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
if (G_CCLOSURE_SWAP_DATA (closure))
{
data1 = closure->data;
data2 = g_value_peek_pointer (param_values + 0);
}
else
{
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
callback = (GMarshalFunc_VOID__UINT_STRING) (marshal_data ? marshal_data : cc->callback);
callback (data1,
g_value_get_uint (param_values + 1),
g_value_get_string (param_values + 2),
data2);
}

36
libnotify/notifymarshal.h
View File

@ -1,36 +0,0 @@
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with main.c; if not, write to:
* The Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __notify_marshal_MARSHAL_H__
#define __notify_marshal_MARSHAL_H__
#include <glib-object.h>
G_BEGIN_DECLS
void
_notify_marshal_VOID__UINT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
G_END_DECLS
#endif

4
libnotify/notifynotification.c
View File

@ -21,7 +21,7 @@
#include "notify.h" #include "notify.h"
#include "notifynotification.h" #include "notifynotification.h"
#include "notifymarshal.h" #include "notify-marshal.h"
static void notify_notification_class_init (NotifyNotificationClass * klass); static void notify_notification_class_init (NotifyNotificationClass * klass);
static void notify_notification_init (NotifyNotification * sp); static void notify_notification_init (NotifyNotification * sp);
@ -126,7 +126,7 @@ notify_notification_class_init (NotifyNotificationClass * klass)
G_TYPE_NONE, G_TYPE_NONE,
0); 0);
dbus_g_object_register_marshaller (_notify_marshal_VOID__UINT_STRING, dbus_g_object_register_marshaller (notify_marshal_VOID__UINT_STRING,
G_TYPE_NONE, G_TYPE_NONE,
G_TYPE_UINT, G_TYPE_UINT,
G_TYPE_STRING, G_TYPE_STRING,