From 27a47dfbe833e8ae08ce6f1bab75e1e0edec09dd Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 15:47:17 +0200 Subject: [eel] remove unused eel-i18n.[ch] was: [eel] remove eel-i18n.[ch] http://git.gnome.org/browse/nautilus/commit/?id=742b9fb1550ceec9284f581c3741c0a864ca82fd --- eel/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'eel/Makefile.am') diff --git a/eel/Makefile.am b/eel/Makefile.am index a973fee8..e061e961 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -46,7 +46,6 @@ libeel_2_la_SOURCES = \ 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 \ @@ -82,7 +81,6 @@ 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 \ -- cgit v1.2.1 From c4e8827c8b614de43f10c7c6c3f50830b93b4fb9 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 3 Nov 2012 02:01:54 +0200 Subject: [eel] remove eel-pango-extensions http://git.gnome.org/browse/nautilus/commit/?id=e42ddad5109f193bf8a5b3c0c6cd7cf4b1408300 --- eel/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'eel/Makefile.am') diff --git a/eel/Makefile.am b/eel/Makefile.am index e061e961..d7b04129 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -49,7 +49,6 @@ libeel_2_la_SOURCES = \ 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 \ @@ -83,7 +82,6 @@ eel_headers = \ eel-gtk-macros.h \ eel-image-table.h \ eel-labeled-image.h \ - eel-pango-extensions.h \ eel-self-checks.h \ eel-stock-dialogs.h \ eel-string.h \ -- cgit v1.2.1 From 628b15b81b856d42bf00339d317cdcdc3200bbc4 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 28 Oct 2012 14:08:09 +0200 Subject: [eel] simplify build system Note: remove eel-types.h include in eel-wrap-table.c (which was removed upstream prior, along with eel-image-table.[ch], after removal of emblems/background-setting stuff, which we're not doing, yet). So change EEL_TYPE_JUSTIFICATION to GTK_TYPE_JUSTIFICATION, and EEL_JUSTIFICATION_BEGINNING to GTK_JUSTIFY_LEFT. Upstream commit/message: We don't need the enumtypes anymore, and the marshallers can easily be autogenerated. http://git.gnome.org/browse/nautilus/commit/?id=75a03a440ebff23ccbf8674ca4a0e9f6475ebbb8 --- eel/Makefile.am | 90 +++++++++++++++++---------------------------------------- 1 file changed, 26 insertions(+), 64 deletions(-) (limited to 'eel/Makefile.am') diff --git a/eel/Makefile.am b/eel/Makefile.am index d7b04129..19407089 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -15,6 +15,11 @@ INCLUDES = \ -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \ $(NULL) +BUILT_SOURCES = \ + eel-marshal.c \ + eel-marshal.h \ + $(NULL) + libeel_2_la_LDFLAGS = \ -no-undefined \ $(CORE_CFLAGS) \ @@ -52,7 +57,6 @@ libeel_2_la_SOURCES = \ 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 \ @@ -85,57 +89,33 @@ eel_headers = \ 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 \ - $(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 > $@.tmp + @if cmp -s $@.tmp $@; then \ + rm $@.tmp; \ + else \ + mv $@.tmp $@; \ + 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 @@ -148,28 +128,10 @@ 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 = \ + $(BUILT_SOURCES) \ + $(NULL) -- cgit v1.2.1 From 8030e5c8d2dc8bd03215584c7e433bafbe6e265a Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 10:55:15 +0200 Subject: [eel] remove EelAlertDialog. It is unused now http://git.gnome.org/browse/nautilus/commit/?id=fe94a33657d55a2463fa066e09a8ecbfc637c4bd --- eel/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'eel/Makefile.am') diff --git a/eel/Makefile.am b/eel/Makefile.am index 19407089..9fb404fc 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -33,7 +33,6 @@ libeel_2_la_LIBADD = \ libeel_2_la_SOURCES = \ eel-accessibility.c \ - eel-alert-dialog.c \ eel-art-extensions.c \ eel-art-gtk-extensions.c \ eel-background.c \ @@ -65,7 +64,6 @@ libeel_2_la_SOURCES = \ eel_headers = \ eel-accessibility.h \ - eel-alert-dialog.h \ eel-art-extensions.h \ eel-art-gtk-extensions.h \ eel-background.h \ -- cgit v1.2.1 From aaa289476ee990743ef573797736d7e42595a251 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 5 Nov 2012 04:48:40 +0200 Subject: [eel] reorganize Makefile.am http://git.gnome.org/browse/nautilus/commit/?id=ad5e896e1ce04485a115ee684a695b42ea0378a5 --- eel/Makefile.am | 71 +++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 37 deletions(-) (limited to 'eel/Makefile.am') diff --git a/eel/Makefile.am b/eel/Makefile.am index 9fb404fc..4883a6f2 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -4,15 +4,13 @@ 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 = \ @@ -31,37 +29,6 @@ libeel_2_la_LIBADD = \ $(X_LIBS) \ $(NULL) -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) - eel_headers = \ eel-accessibility.h \ eel-art-extensions.h \ @@ -93,6 +60,37 @@ eel_headers = \ eel.h \ $(NULL) +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) + nodist_libeel_2_la_SOURCES = \ $(BUILT_SOURCES) \ $(NULL) @@ -125,9 +123,8 @@ check_program_LDFLAGS = $(check_program_DEPENDENCIES) -lm TESTS = check-eel EXTRA_DIST = \ - $(eel_headers) \ check-eel \ - eel-marshal.list \ + eel-marshal.list \ $(NULL) CLEANFILES = \ -- cgit v1.2.1 From 4d27e091b87bc08fee257fda6cb3f928c3aee39f Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 17:30:19 +0200 Subject: [build] fix distcheck http://git.gnome.org/browse/nautilus/commit/?id=74a0311e65f2c9fc2d03967b0607633dcb652f88 --- eel/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'eel/Makefile.am') diff --git a/eel/Makefile.am b/eel/Makefile.am index 4883a6f2..831ab7d5 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -128,5 +128,6 @@ EXTRA_DIST = \ $(NULL) CLEANFILES = \ + eel-marshal.list \ $(BUILT_SOURCES) \ $(NULL) -- cgit v1.2.1