Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove glib-genmarshal glue

Browse Source 
This also fixes distcheck.
This commit is contained in:
Cosimo Cecchi
2012-09-04 15:43:11 -04:00
parent 3b1c9f04b1
commit ef6fbe044d
4 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-3
View File
@@ -74,6 +74,3 @@ Debug*
data/org.gnome.calendar.enums.xml data/org.gnome.calendar.enums.xml
src/gcal-enum-types.c src/gcal-enum-types.c
src/gcal-enum-types.h src/gcal-enum-types.h
src/gcal-marshalers.c
src/gcal-marshalers.h
src/stamp-gcal-marshalers.h
configure.ac
-1
View File
@@ -47,7 +47,6 @@ GLIB_GSETTINGS
dnl ================================================================ dnl ================================================================
dnl Misc dnl Misc
dnl ================================================================ dnl ================================================================
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
GNOME_COMMON_INIT GNOME_COMMON_INIT
src/Makefile.am
+4 -43
View File
@@ -15,8 +15,6 @@ AM_CFLAGS = \
bin_PROGRAMS = gnome-calendar bin_PROGRAMS = gnome-calendar
BUILT_SOURCES = \ BUILT_SOURCES = \
gcal-marshalers.c \
gcal-marshalers.h \
gcal-enum-types.c \ gcal-enum-types.c \
gcal-enum-types.h gcal-enum-types.h
@@ -63,56 +61,19 @@ gnome_calendar_LDADD = \
ENUM_TYPES = \ ENUM_TYPES = \
gcal-utils.h gcal-utils.h
if MAINTAINER_MODE
CLEANFILES = \
$(BUILT_SOURCES) \
stamp-gcal-marshalers.h \
xgen-ac \
xgen-ah \
xgen-etbc \
xgen-etbh \
xgen-tmc \
xgen-tmh \
$(NULL)
gcal-enum-types.h: gcal-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS) gcal-enum-types.h: gcal-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.h.template $(ENUM_TYPES)) > $@ $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.h.template $(ENUM_TYPES)) > $@
gcal-enum-types.c: gcal-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS) gcal-enum-types.c: gcal-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.c.template $(ENUM_TYPES)) > $@ $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.c.template $(ENUM_TYPES)) > $@
gcal-marshalers.h: stamp-gcal-marshalers.h CLEANFILES = \
@true $(BUILT_SOURCES) \
$(NULL)
stamp-gcal-marshalers.h: gcal-marshalers.list Makefile
$(AM_V_GEN) ( \
cd $(srcdir) \
&& ( glib-genmarshal \
--prefix=_gcal_marshal \
--header gcal-marshalers.list ) >> xgen-tmh \
&& ( cmp -s xgen-tmh gcal-marshalers.h || cp xgen-tmh gcal-marshalers.h ) \
&& rm -f xgen-tmh \
&& echo timestamp > $(@F) \
)
gcal-marshalers.c: gcal-marshalers.list gcal-marshalers.h Makefile
$(AM_V_GEN) ( \
cd $(srcdir) \
&& echo "#include \"gcal-marshalers.h\"" > xgen-tmc \
&& ( glib-genmarshal \
--prefix=_gcal_marshal \
--body gcal-marshalers.list ) >> xgen-tmc \
&& cp xgen-tmc gcal-marshalers.c \
&& rm -f xgen-tmc \
)
endif
EXTRA_DIST = \ EXTRA_DIST = \
gcal-enum-types.h.template \ gcal-enum-types.h.template \
gcal-enum-types.c.template \ gcal-enum-types.c.template
gcal-marshalers.list
dist-hook: dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES) cd $(distdir); rm -f $(BUILT_SOURCES)
src/gcal-marshalers.list
-3
View File
@@ -1,3 +0,0 @@
VOID:POINTER,POINTER,DOUBLE,DOUBLE
VOID:POINTER,POINTER
VOID:POINTER,BOOLEAN