Merge pull request #42 from jasmineaura/develop

Bring Caja up to speed, stage1
author: Stefano Karapetsas <[email protected]> 2012-11-16 05:08:48 -0800
committer: Stefano Karapetsas <[email protected]> 2012-11-16 05:08:48 -0800
commit: dc66bc40724191f0068869773576dc4edf042c6f (patch)
tree: 74b9684feea188736b21f2c829f29befaaf2e9da /eel/Makefile.am
parent: 935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent: 1466df20591105550738a1d0784a623af9909abf (diff)
download: caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2
caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz
1 files changed, 58 insertions, 104 deletions
diff --git a/eel/Makefile.am b/eel/Makefile.am
index a973fee8..831ab7d5 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -4,15 +4,18 @@ noinst_LTLIBRARIES=libeel-2.la
 
 INCLUDES = \
 -DG_LOG_DOMAIN=\"Eel\" \
- -I$(top_srcdir) \
+ -I$(top_builddir) \
 $(CORE_CFLAGS) \
 $(WARNING_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
 -DDATADIR=\""$(datadir)"\" \
 -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
 -DMATELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
- -DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \
+ $(NULL)
+
+BUILT_SOURCES = \
+ eel-marshal.c \
+ eel-marshal.h \
 $(NULL)
 
 libeel_2_la_LDFLAGS = \
@@ -26,44 +29,8 @@ libeel_2_la_LIBADD = \
 $(X_LIBS) \
 $(NULL)
 
-libeel_2_la_SOURCES = \
- eel-accessibility.c \
- eel-alert-dialog.c \
- eel-art-extensions.c \
- eel-art-gtk-extensions.c \
- eel-background.c \
- eel-background-box.c \
- eel-canvas.c \
- eel-canvas-util.c \
- eel-canvas-rect-ellipse.c \
- eel-debug-drawing.c \
- eel-debug.c \
- eel-editable-label.c \
- eel-gdk-extensions.c \
- eel-gdk-pixbuf-extensions.c \
- eel-glib-extensions.c \
- eel-mate-extensions.c \
- eel-graphic-effects.c \
- eel-gtk-container.c \
- eel-gtk-extensions.c \
- eel-i18n.c \
- eel-image-table.c \
- eel-labeled-image.c \
- eel-lib-self-check-functions.c \
- eel-pango-extensions.c \
- eel-self-checks.c \
- eel-stock-dialogs.c \
- eel-string.c \
- eel-types.c \
- eel-vfs-extensions.c \
- eel-wrap-table.c \
- eel-xml-extensions.c \
- eel-lib-self-check-functions.h \
- $(NULL)
-
 eel_headers = \
 eel-accessibility.h \
- eel-alert-dialog.h \
 eel-art-extensions.h \
 eel-art-gtk-extensions.h \
 eel-background.h \
@@ -82,64 +49,69 @@ eel_headers = \
 eel-gtk-container.h \
 eel-gtk-extensions.h \
 eel-gtk-macros.h \
- eel-i18n.h \
 eel-image-table.h \
 eel-labeled-image.h \
- eel-pango-extensions.h \
 eel-self-checks.h \
 eel-stock-dialogs.h \
 eel-string.h \
- eel-types.h \
 eel-vfs-extensions.h \
 eel-wrap-table.h \
 eel-xml-extensions.h \
 eel.h \
 $(NULL)
 
-marshal_sources = \
- eel-marshal.h \
- eel-marshal.c \
- $(NULL)
-
-eel-marshal.h: eelmarshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=eel_marshal > $@
-eel-marshal.c: eelmarshal.list $(GLIB_GENMARSHAL)
- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --body --prefix=eel_marshal > $@
-
-stamp_sources = \
- eel-enums.defs \
- eel-type-builtins-evals.c \
+libeel_2_la_SOURCES = \
+ eel-accessibility.c \
+ eel-art-extensions.c \
+ eel-art-gtk-extensions.c \
+ eel-background.c \
+ eel-background-box.c \
+ eel-canvas.c \
+ eel-canvas-util.c \
+ eel-canvas-rect-ellipse.c \
+ eel-debug-drawing.c \
+ eel-debug.c \
+ eel-editable-label.c \
+ eel-gdk-extensions.c \
+ eel-gdk-pixbuf-extensions.c \
+ eel-glib-extensions.c \
+ eel-mate-extensions.c \
+ eel-graphic-effects.c \
+ eel-gtk-container.c \
+ eel-gtk-extensions.c \
+ eel-image-table.c \
+ eel-labeled-image.c \
+ eel-lib-self-check-functions.c \
+ eel-self-checks.c \
+ eel-stock-dialogs.c \
+ eel-string.c \
+ eel-vfs-extensions.c \
+ eel-wrap-table.c \
+ eel-xml-extensions.c \
+ eel-lib-self-check-functions.h \
 $(NULL)
 
-stamps = \
- eel-makeenums-stamp \
- eel-stamp \
+nodist_libeel_2_la_SOURCES = \
+ $(BUILT_SOURCES) \
 $(NULL)
 
-eel-makeenums-stamp: makeenums.pl $(eel_headers)
- $(AM_V_GEN)$(PERL) $< defs $(filter-out $<,$^) > xgen-eed \
- && (cmp -s xgen-eed eel-enums.defs || mv -f xgen-eed eel-enums.defs) \
- && rm -f xgen-eed \
- && $(PERL) $< arrays $(filter-out $<,$^) > xgen-etbe \
- && (cmp -s xgen-etbe eel-type-builtins-evals.c || mv -f xgen-etbe eel-type-builtins-evals.c) \
- && rm -f xgen-etbe \
- && echo timestamp > $@
-
-maketypes_sources = \
- eel-type-builtins.h \
- eel-type-builtins-ids.c \
- eel-type-builtins-vars.c \
- $(NULL)
+eel-marshal.list: $(libeel_2_la_SOURCES) Makefile.am
+ $(AM_V_GEN)( cd $(srcdir) && \
+ sed -n -e 's/.*eel_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+ $(libeel_2_la_SOURCES) ) \
+ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > [email protected]
+ @if cmp -s [email protected] $@; then \
+ rm [email protected]; \
+ else \
+ mv [email protected] $@; \
+ fi
 
-eel-stamp: eel-makeenums-stamp $(maketypes_sources)
- echo timestamp > $@
+%-marshal.c: %-marshal.list Makefile
+ $(AM_V_GEN)echo "#include \"eel-marshal.h\"" > $@ && \
+ $(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
-eel-type-builtins.h: eel-enums.defs maketypes.awk eel-makeenums-stamp
- LC_ALL=C $(AWK) -f $(srcdir)/maketypes.awk $< macros > $@
-eel-type-builtins-vars.c: eel-enums.defs maketypes.awk eel-makeenums-stamp
- LC_ALL=C $(AWK) -f $(srcdir)/maketypes.awk $< variables > $@
-eel-type-builtins-ids.c: eel-enums.defs maketypes.awk eel-makeenums-stamp
- LC_ALL=C $(AWK) -f $(srcdir)/maketypes.awk $< entries > $@
+%-marshal.h: %-marshal.list Makefile
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
 
 noinst_PROGRAMS = check-program
 
@@ -151,29 +123,11 @@ check_program_LDFLAGS = $(check_program_DEPENDENCIES) -lm
 TESTS = check-eel
 
 EXTRA_DIST = \
- $(eel_headers) \
- eel-type-builtins.h \
- eel-marshal.h \
 check-eel \
- eelmarshal.list \
- makeenums.pl \
- maketypes.awk \
+ eel-marshal.list \
 $(NULL)
 
-$(libeel_2_la_OBJECTS): $(marshal_sources)
-
-# This trick causes the stamp file to be built first.
-Makefile: eel-stamp
-
-# This trick causes the generated files to be built the first time.
-$(stamp_sources): # never add any dependencies
- test -f $@ || touch $@
-
-built_sources = $(stamps) $(stamp_sources) $(maketypes_sources) $(marshal_sources)
-CLEANFILES = $(built_sources)
-DONT_DIST_FILES = $(built_sources)
-
-dist-hook:
- for file in $(DONT_DIST_FILES) ; do \
- rm -f $(distdir)/$$file ; \
- done
+CLEANFILES = \
+ eel-marshal.list \
+ $(BUILT_SOURCES) \
+ $(NULL)
author	Stefano Karapetsas <[email protected]>	2012-11-16 05:08:48 -0800
committer	Stefano Karapetsas <[email protected]>	2012-11-16 05:08:48 -0800
commit	dc66bc40724191f0068869773576dc4edf042c6f (patch)
tree	74b9684feea188736b21f2c829f29befaaf2e9da /eel/Makefile.am
parent	935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent	1466df20591105550738a1d0784a623af9909abf (diff)
download	caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2 caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz