diff options
Diffstat (limited to 'shell/Makefile.am')
| -rw-r--r-- | shell/Makefile.am | 157 |
1 files changed, 51 insertions, 106 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index defd6266c3..7c5900ce09 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,28 +1,20 @@ SUBDIRS = glade importer -INCLUDES = \ - -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ - -DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \ +INCLUDES = -O \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir) \ - -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(datadir)"\" \ + -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"evolution-shell\" \ $(SHELL_CFLAGS) -noinst_PROGRAMS = evolution evolution-test-component - # Shell CORBA stuff IDLS = \ @@ -41,74 +33,58 @@ IDLS = \ Evolution-common.idl \ Evolution.idl -IDL_GENERATED_H = \ - Evolution.h - -IDL_GENERATED_C = \ +IDL_GENERATED = \ + Evolution.h \ Evolution-common.c \ Evolution-skels.c \ Evolution-stubs.c -IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C) - -$(IDL_GENERATED_H): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/Evolution.idl - -$(IDL_GENERATED_C): $(IDL_GENERATED_H) +Evolution-impl.o: Evolution.h +$(IDL_GENERATED): $(IDLS) + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(srcdir)/Evolution.idl # SelectNames CORBA stuff SELECT_NAMES_IDL = \ $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl -SELECT_NAMES_IDL_GENERATED_H = \ - Evolution-Addressbook-SelectNames.h - -SELECT_NAMES_IDL_GENERATED_C = \ +SELECT_NAMES_IDL_GENERATED = \ + Evolution-Addressbook-SelectNames.h \ Evolution-Addressbook-SelectNames-common.c \ Evolution-Addressbook-SelectNames-skels.c \ Evolution-Addressbook-SelectNames-stubs.c -SELECT_NAMES_IDL_GENERATED = $(SELECT_NAMES_IDL_GENERATED_C) $(SELECT_NAMES_IDL_GENERATED_H) - -$(SELECT_NAMES_IDL_GENERATED_H): $(SELECT_NAMES_IDL) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(SELECT_NAMES_IDL) - -$(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H) - +$(SELECT_NAMES_IDL_GENERATED): $(SELECT_NAMES_IDL) + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(SELECT_NAMES_IDL) # Wombat CORBA stuff -WOMBAT_IDL = \ - $(top_srcdir)/wombat/Evolution-Wombat.idl - -WOMBAT_IDL_GENERATED_H = \ - Evolution-Wombat.h +WOMBAT_IDL = $(top_srcdir)/wombat/Evolution-Wombat.idl -WOMBAT_IDL_GENERATED_C = \ +WOMBAT_IDL_GENERATED = \ + Evolution-Wombat.h \ Evolution-Wombat-common.c \ Evolution-Wombat-skels.c \ Evolution-Wombat-stubs.c -WOMBAT_IDL_GENERATED = $(WOMBAT_IDL_GENERATED_C) $(WOMBAT_IDL_GENERATED_H) - -$(WOMBAT_IDL_GENERATED_H): $(WOMBAT_IDL) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(WOMBAT_IDL) - -$(WOMBAT_IDL_GENERATED_C): $(WOMBAT_IDL_GENERATED_H) - +$(WOMBAT_IDL_GENERATED): $(WOMBAT_IDL) + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` $(WOMBAT_IDL) # IDL install +idldir = $(datadir)/idl + idl_DATA = $(IDLS) # Shell library -privlib_LTLIBRARIES = \ +lib_LTLIBRARIES = \ libeshell.la -eshellincludedir = $(privincludedir)/shell +eshellincludedir = $(includedir)/evolution/shell eshellinclude_HEADERS = \ Evolution.h \ @@ -151,14 +127,12 @@ libeshell_la_SOURCES = \ evolution-storage-set-view-listener.c \ evolution-storage.c \ evolution-wizard.c \ - e-shell-marshal.c \ $(eshellinclude_HEADERS) -libeshell_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la - # Evolution executable +bin_PROGRAMS = evolution + evolution_SOURCES = \ $(SELECT_NAMES_IDL_GENERATED) \ $(WOMBAT_IDL_GENERATED) \ @@ -168,8 +142,6 @@ evolution_SOURCES = \ e-component-info.h \ e-component-registry.c \ e-component-registry.h \ - e-config-upgrade.c \ - e-config-upgrade.h \ e-corba-config-page.c \ e-corba-config-page.h \ e-corba-shortcuts.c \ @@ -182,6 +154,8 @@ evolution_SOURCES = \ e-folder-dnd-bridge.h \ e-folder-type-registry.c \ e-folder-type-registry.h \ + e-gray-bar.c \ + e-gray-bar.h \ e-history.c \ e-history.h \ e-icon-factory.c \ @@ -264,14 +238,17 @@ evolution_SOURCES = \ evolution_LDADD = \ libeshell.la \ importer/libevolution-importer.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a \ + $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libical/src/libical/libical-evolution.la \ $(SHELL_LIBS) # Test component +noinst_PROGRAMS = \ + evolution-test-component + evolution_test_component_SOURCES = \ evolution-test-component.c @@ -280,67 +257,35 @@ evolution_test_component_LDADD = \ $(SHELL_LIBS) install-test-component: evolution-test-component + $(mkinstalldirs) $(DESTDIR)$(bindir) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-test-component $(DESTDIR)$(bindir)/evolution-test-component - $(mkinstalldirs) $(DESTDIR)$(serverdir) - $(INSTALL_DATA) $(srcdir)/GNOME_Evolution_TestComponent.server $(DESTDIR)$(serverdir)/GNOME_Evolution_TestComponent.server + $(mkinstalldirs) $(DESTDIR)$(oafdir) + $(INSTALL_DATA) $(srcdir)/GNOME_Evolution_TestComponent.oaf $(DESTDIR)$(oafdir)/GNOME_Evolution_TestComponent.oaf # Misc stuff -server_in_files = GNOME_Evolution_Shell.server.in.in -server_DATA = $(server_in_files:.server.in.in=.server) -$(server_in_files:.server.in.in=.server.in): $(server_in_files) - sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ +oafdir = $(datadir)/oaf +oaf_in_files = GNOME_Evolution_Shell.oaf.in +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) -etspec_DATA = e-storage-set-view.etspec +etspecdir = $(datadir)/evolution/etspec/ +etspec_DATA = \ + e-storage-set-view.etspec -@INTLTOOL_SERVER_RULE@ +@XML_I18N_MERGE_OAF_RULE@ icons = \ check-empty.xpm \ check-filled.xpm \ check-missing.xpm -# GConf schemas - -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = apps_evolution_shell.schemas - -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 $(srcdir)/$$p; \ - done \ - fi - -install-exec-local: - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) - - -# GLib marshalling cruft - -e-shell-marshal.h: e-shell-marshal.list - ( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal e-shell-marshal.list --header > e-shell-marshal.h.tmp \ - && mv e-shell-marshal.h.tmp e-shell-marshal.h ) \ - || ( rm -f e-shell-marshal.h.tmp && exit 1 ) - -e-shell-marshal.c: e-shell-marshal.h - ( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal e-shell-marshal.list --body > e-shell-marshal.c.tmp \ - && mv e-shell-marshal.c.tmp e-shell-marshal.c ) \ - || ( rm -f e-shell-marshal.c.tmp && exit 1 ) - -MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h - -# Extra dist stuff - EXTRA_DIST = \ $(IDLS) \ - $(server_in_files) \ - $(server_DATA) \ + $(oaf_in_files) \ + $(oaf_DATA) \ $(etspec_DATA) \ - $(schema_DATA) \ $(icons) \ - GNOME_Evolution_TestComponent.server \ - e-shell-marshal.list \ + GNOME_Evolution_TestComponent.oaf \ evolution-nognome.in # Purify support @@ -357,8 +302,8 @@ evolution.pure: evolution endif -BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) +BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) @@ -368,4 +313,4 @@ if HAVE_DTAPPINTEGRATE bin_SCRIPTS = evolution-nognome -endif +endif
\ No newline at end of file |