From 40a550f2bb6dc1770767e824a2c77307a5dffa9b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 18 Jun 2005 18:36:55 +0000 Subject: gui/component/Makefile.am gui/contact-editor/Makefile.am 2005-06-18 Tor Lillqvist * gui/component/Makefile.am * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am * gui/merging/Makefile.am * gui/search/Makefile.am * gui/widgets/Makefile.am: Prune unnecessary and nonexistent directories from the -I options. Prune pathname macros not used in the sources in that directory from the -D options. * gui/component/Makefile.am * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am * util/Makefile.am: Use NO_UNDEFINED. Link with all necessary libraries. * gui/component/Makefile.am: Use Win32-specific hack to work around MSYS feature in the gconftool invocation. * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am: Use bootstrap library libevolution-addressbook on Win32. * gui/contact-editor/Makefile.am * gui/contact-list-editor/Makefile.am * util/Makefile.am: Use privsolib_LTLIBRARIES instead of privlib_LTLIBRARIES (see ../ChangeLog). svn path=/trunk/; revision=29546 --- addressbook/ChangeLog | 27 +++++++++++++++++++++++++ addressbook/gui/component/Makefile.am | 24 ++++++++++++++-------- addressbook/gui/contact-editor/Makefile.am | 23 ++++++++++++--------- addressbook/gui/contact-list-editor/Makefile.am | 23 ++++++++++++++------- addressbook/gui/merging/Makefile.am | 2 -- addressbook/gui/search/Makefile.am | 7 ------- addressbook/gui/widgets/Makefile.am | 5 +---- addressbook/util/Makefile.am | 4 +++- 8 files changed, 77 insertions(+), 38 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 2a1103ff45..fefb06bd1f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,32 @@ 2005-06-18 Tor Lillqvist + * gui/component/Makefile.am + * gui/contact-editor/Makefile.am + * gui/contact-list-editor/Makefile.am + * gui/merging/Makefile.am + * gui/search/Makefile.am + * gui/widgets/Makefile.am: Prune unnecessary and nonexistent + directories from the -I options. Prune pathname macros not used in + the sources in that directory from the -D options. + + * gui/component/Makefile.am + * gui/contact-editor/Makefile.am + * gui/contact-list-editor/Makefile.am + * util/Makefile.am: Use NO_UNDEFINED. Link with all necessary + libraries. + + * gui/component/Makefile.am: Use Win32-specific hack to work + around MSYS feature in the gconftool invocation. + + * gui/contact-editor/Makefile.am + * gui/contact-list-editor/Makefile.am: Use bootstrap library + libevolution-addressbook on Win32. + + * gui/contact-editor/Makefile.am + * gui/contact-list-editor/Makefile.am + * util/Makefile.am: Use privsolib_LTLIBRARIES instead of + privlib_LTLIBRARIES (see ../ChangeLog). + * gui/component/GNOME_Evolution_Addressbook.server.in.in * importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in * importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in: diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 42f0f1713e..89d7b26dad 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -2,20 +2,14 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - -I$(top_builddir) \ - -I$(top_srcdir)/shell \ -I$(top_builddir)/shell \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir)/addressbook/util \ -I$(top_srcdir)/addressbook/gui/contact-editor \ -I$(top_srcdir)/addressbook/gui/contact-list-editor \ -I$(top_srcdir)/addressbook/gui/widgets \ - -I$(top_builddir)/a11y/addressbook \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -I$(top_srcdir)/a11y/addressbook \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ -DPREFIX=\""$(prefix)"\" \ $(LDAP_CFLAGS) \ @@ -46,6 +40,7 @@ endif libevolution_addressbook_la_LIBADD = \ $(SMIME_LIB) \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ @@ -55,6 +50,8 @@ libevolution_addressbook_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ @@ -62,7 +59,7 @@ libevolution_addressbook_la_LIBADD = \ -libevolution_addressbook_la_LDFLAGS = -module -avoid-version +libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) # GConf schemas @@ -74,12 +71,23 @@ schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + done \ + fi +else install-data-local: if test -z "$(DESTDIR)" ; then \ for p in $(schema_DATA) ; do \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ done \ fi +endif server_in_files = GNOME_Evolution_Addressbook.server.in.in server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 642bc1edf1..e8692bb7f2 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,23 +1,20 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la +endif + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/addressbook/gui/merging \ -I$(top_srcdir)/widgets/table \ -I$(top_builddir)/shell \ - -I$(top_srcdir)/camel \ - -I$(top_builddir)/camel \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \ - -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -privlib_LTLIBRARIES = \ +privsolib_LTLIBRARIES = \ libecontacteditor.la libecontacteditor_la_SOURCES = \ @@ -35,11 +32,19 @@ libecontacteditor_la_SOURCES = \ e-contact-quick-add.c \ e-contact-quick-add.h +libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED) + +libecontacteditor_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h @EVO_MARSHAL_RULE@ glade_DATA = \ - im.glade \ + im.glade \ contact-editor.glade \ fulladdr.glade \ fullname.glade diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 10069eaca1..71516c33bb 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -1,22 +1,20 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la +endif + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/addressbook/gui/merging \ -I$(top_srcdir)/addressbook/gui/contact-editor \ -I$(top_builddir)/shell \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \ - -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -privlib_LTLIBRARIES = \ +privsolib_LTLIBRARIES = \ libecontactlisteditor.la libecontactlisteditor_la_SOURCES = \ @@ -26,6 +24,17 @@ libecontactlisteditor_la_SOURCES = \ e-contact-list-model.c \ e-contact-list-model.h +libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) + +libecontactlisteditor_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h @EVO_MARSHAL_RULE@ diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index f1d589ad00..c899d751f4 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -3,8 +3,6 @@ INCLUDES = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LTLIBRARIES = \ diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am index 391039d81f..4148a8145c 100644 --- a/addressbook/gui/search/Makefile.am +++ b/addressbook/gui/search/Makefile.am @@ -6,13 +6,6 @@ EXTRA_DIST = addresstypes.xml INCLUDES = \ -DG_LOG_DOMAIN=\"e-addressbook-search\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ - -I$(top_srcdir)/addressbook/contact-editor \ - -I$(top_srcdir)/widgets/e-text \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/shell \ - -DSEARCH_RULE_DIR=\"$(ruledir)\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LTLIBRARIES = \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index db15e8602c..1c3ad25d7b 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -3,19 +3,16 @@ ruledir = $(privdatadir) INCLUDES = \ -DG_LOG_DOMAIN=\"eab-widgets\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -DSEARCH_RULE_DIR=\"$(ruledir)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook \ - -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 \ - -DSEARCH_RULE_DIR=\"$(ruledir)\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) CORBA_COMPOSER_SOURCE_H = \ diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 20d642de8e..cdafbb272d 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -10,13 +10,15 @@ INCLUDES = \ -I$(top_srcdir)/shell \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -privlib_LTLIBRARIES = libeabutil.la +privsolib_LTLIBRARIES = libeabutil.la libeabutil_la_SOURCES = \ eab-marshal.c \ eab-book-util.c \ eab-book-util.h +libeabutil_la_LDFLAGS = $(NO_UNDEFINED) + libeabutil_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ -- cgit v1.2.3