From 675a9d147ab100372a7026688cbafc4665498c8b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 5 Feb 2003 23:48:14 +0000 Subject: Remove cruft. (gladedir, etspecdir): Remove definitions. (glade_DATA): * gui/widgets/Makefile.am (INCLUDES): Remove cruft. (gladedir, etspecdir): Remove definitions. (glade_DATA): Empty, so remove it. * gui/widgets/e-addressbook-reflow-adapter.c: #include (addressbook_get_property): Remove unused variable * gui/widgets/e-addressbook-view.c: #include (get_selection_model): Add a g_return_val_if_reached. * gui/widgets/e-minicard.c: #include string.h, gtkmain.h, gnome-canvas-pixbuf.h (field_changed): s/gtk_object_unref/g_object_unref/ (get_left_width): Remove unused variable * gui/widgets/e-minicard-control.c: #include (pstream_load, pstream_save): Use g_ascii_strcasecmp * gui/widgets/e-minicard-view.c: #include * gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_new): s/gtk_type_new/g_object_new/ svn path=/trunk/; revision=19784 --- addressbook/gui/widgets/Makefile.am | 39 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'addressbook/gui/widgets/Makefile.am') diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index aa3dbe464c..44938fb100 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,22 +1,20 @@ INCLUDES = \ - -DG_LOG_DOMAIN=\"e-minicard\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/views\" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ - -I$(top_srcdir)/addressbook/gui/contact-editor \ - -I$(top_srcdir)/addressbook/gui/merging \ - -I$(top_srcdir)/addressbook/gui/component \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/shell \ - -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DLIBGNOME_DISABLE_DEPRECATED \ - -DLIBGNOMEUI_DISABLE_DEPRECATED \ + -DG_LOG_DOMAIN=\"e-minicard\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ + -I$(top_srcdir)/addressbook/gui/contact-editor \ + -I$(top_srcdir)/addressbook/gui/merging \ + -I$(top_srcdir)/addressbook/gui/component \ + -I$(top_srcdir)/widgets/misc \ + -I$(top_builddir)/shell \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DLIBGNOME_DISABLE_DEPRECATED \ + -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ @@ -154,13 +152,8 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h # $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ # $(EVOLUTION_ADDRESSBOOK_LIBS) -gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade -glade_DATA = - -etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ - $(glade_DATA) \ $(etspec_DATA) \ e-addressbook-marshal.list -- cgit v1.2.3