Fix for the settings segfault that was introduced in -current. Also remove

the NEWDYNLIBDIR entry as it is no longer needed.

ok pvalchev@ naddy@
This commit is contained in:
marcm 2003-02-23 23:10:08 +00:00
parent a96d3a8285
commit e5588c2182
2 changed files with 13 additions and 2 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-shell_Makefile_in,v 1.1 2003/02/23 23:10:08 marcm Exp $
--- shell/Makefile.in.orig Tue Feb 4 09:39:18 2003
+++ shell/Makefile.in Wed Feb 19 18:46:43 2003
@@ -274,7 +274,7 @@ bin_PROGRAMS = evolution
evolution_SOURCES = $(SELECT_NAMES_IDL_GENERATED) $(WOMBAT_IDL_GENERATED) e-activity-handler.c e-activity-handler.h e-component-info.c e-component-info.h e-component-registry.c e-component-registry.h e-corba-config-page.c e-corba-config-page.h e-corba-shortcuts.c e-corba-shortcuts.h e-corba-storage-registry.c e-corba-storage-registry.h e-corba-storage.c e-corba-storage.h e-folder-dnd-bridge.c 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 e-icon-factory.h e-local-folder.c e-local-folder.h e-local-storage.c e-local-storage.h e-setup.c e-setup.h e-shell-about-box.c e-shell-about-box.h e-shell-config.c e-shell-config.h e-shell-config-autocompletion.c e-shell-config-autocompletion.h e-shell-config-offline.c e-shell-config-offline.h e-shell-config-default-folders.c e-shell-config-default-folders.h e-shell-config-folder-settings.c e-shell-config-folder-settings.h e-shell-constants.h e-shell-folder-commands.c e-shell-folder-commands.h e-shell-folder-creation-dialog.c e-shell-folder-creation-dialog.h e-shell-folder-selection-dialog.c e-shell-folder-selection-dialog.h e-shell-folder-title-bar.c e-shell-folder-title-bar.h e-shell-importer.c e-shell-importer.h e-shell-offline-handler.c e-shell-offline-handler.h e-shell-offline-sync.c e-shell-offline-sync.h e-shell-settings-dialog.c e-shell-settings-dialog.h e-shell-shared-folder-picker-dialog.c e-shell-shared-folder-picker-dialog.h e-shell-startup-wizard.c e-shell-startup-wizard.h e-shell-user-creatable-items-handler.c e-shell-user-creatable-items-handler.h e-shell-utils.c e-shell-utils.h e-shell-view-menu.c e-shell-view-menu.h e-shell-view.c e-shell-view.h e-shell.c e-shell.h e-shortcuts-view-model.c e-shortcuts-view-model.h e-shortcuts-view.c e-shortcuts-view.h e-shortcuts.c e-shortcuts.h e-splash.c e-splash.h e-storage-set-view.c e-storage-set-view.h e-storage-set.c e-storage-set.h e-storage.c e-storage.h e-task-bar.c e-task-bar.h e-task-widget.c e-task-widget.h e-uri-schema-registry.c e-uri-schema-registry.h evolution-storage-set-view.c evolution-storage-set-view.h evolution-storage-set-view-factory.c evolution-storage-set-view-factory.h main.c
-evolution_LDADD = libeshell.la importer/libevolution-importer.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)
+evolution_LDADD = .libs/libeshell.a importer/libevolution-importer.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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2003/01/03 21:53:07 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.5 2003/02/23 23:10:08 marcm Exp $
lib/evolution/1.2/camel-providers/libcamelimap.so
lib/evolution/1.2/camel-providers/libcamellocal.so
lib/evolution/1.2/camel-providers/libcamelpop3.so
@ -18,4 +18,3 @@ lib/libeshell.so.0.0
lib/libevolution-importer.so.0.0
lib/libwombat.so.0.0
DYNLIBDIR(%D/lib)
NEWDYNLIBDIR(%D/lib/evolution/1.2)