From ea7bec6c1fa652a242ab9e513772df4ae230013f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 5 Mar 2010 23:29:06 +0100 Subject: [PATCH] Removing windows hack with dummy import libraries This hack seems not to be necessary anymore, so removing it. --- Makefile.am | 4 +- configure.ac | 1 - win32/Makefile.am | 21 -------- win32/README | 12 ----- win32/dummy.la | 32 ------------ win32/libedataserverui.def | 118 --------------------------------------------- 6 files changed, 2 insertions(+), 186 deletions(-) delete mode 100644 win32/Makefile.am delete mode 100644 win32/README delete mode 100644 win32/dummy.la delete mode 100644 win32/libedataserverui.def diff --git a/Makefile.am b/Makefile.am index 5d06719..ca8b09d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,8 @@ if ENABLE_CALENDAR CALENDAR_DIR = calendar endif -SUBDIRS = win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po -DIST_SUBDIRS = win32 libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po +SUBDIRS = libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po +DIST_SUBDIRS = libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po changelogs = \ ChangeLog diff --git a/configure.ac b/configure.ac index 1ab4c74..38425a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1491,7 +1491,6 @@ servers/google/libgdata/Makefile servers/google/libgdata/libgdata.pc servers/google/libgdata-google/Makefile servers/google/libgdata-google/libgdata-google.pc -win32/Makefile docs/Makefile docs/reference/Makefile docs/reference/addressbook/Makefile diff --git a/win32/Makefile.am b/win32/Makefile.am deleted file mode 100644 index ae8a379..0000000 --- a/win32/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -EXTRA_DIST = \ - dummy.la \ - libedataserverui.def - -if OS_WIN32 -BOOTSTRAP_LIBS = \ - libedataserverui-1.2.la -endif - -noinst_DATA = $(BOOTSTRAP_LIBS) - -libedataserverui_current_minus_age = `expr $(LIBEDATASERVERUI_CURRENT) - $(LIBEDATASERVERUI_AGE)` - -libedataserverui-1.2.la: dummy.la libedataserverui.def - sed -e s!%DLL%!libedataserverui-1.2-$(libedataserverui_current_minus_age)! -e s!%LIB%!libedataserverui-1.2! -e s!%PFX%!$(prefix)! $@ - mkdir -p .libs - $(DLLTOOL) --output-lib=.libs/libedataserverui-1.2.dll.a --dllname=libedataserverui-1.2-$(libedataserverui_current_minus_age).dll --input-def=libedataserverui.def - -CLEANFILES = $(BOOTSTRAP_LIBS) - --include $(top_srcdir)/git.mk diff --git a/win32/README b/win32/README deleted file mode 100644 index b21fcca..0000000 --- a/win32/README +++ /dev/null @@ -1,12 +0,0 @@ -This directory contains .def files for some of the DLLs in EDS. They -are used to build bootstrap import libraries for these DLLs in advance -before they have actually been built. This is necessary because -Evolution's shared libraries have circular dependencies, and one can't -have unresolved symbols when building shared libraries on Win32. - -These .def files aren't used when building the actual DLLs in -question. They are only used to produce bootstrap import libraries for -them. Thus a .def file for libFOO here doesn't list all the actual -entry points in libFOO, only those that are used by other DLLs that -are built before libFOO. When the actual libFOO is built, we rely on -the GNU linker's auto-export to export all public symbols. diff --git a/win32/dummy.la b/win32/dummy.la deleted file mode 100644 index 887809b..0000000 --- a/win32/dummy.la +++ /dev/null @@ -1,32 +0,0 @@ -# %LIB%.la - a libtool library file -# Generated by ltmain.sh - GNU libtool - well, actually not, hacked manually - -# The name that we can dlopen(3). -dlname='%DLL%.dll' - -# Names of this library. -library_names='%LIB%.dll.a' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='' - -# Version information for %LIB% -current=0 -age=0 -revision=0 - -# Is this an already installed library? -installed=no - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='%PFX%/lib' diff --git a/win32/libedataserverui.def b/win32/libedataserverui.def deleted file mode 100644 index f1363cf..0000000 --- a/win32/libedataserverui.def +++ /dev/null @@ -1,118 +0,0 @@ -EXPORTS - e_categories_dialog_get_categories - e_categories_dialog_get_type - e_categories_dialog_new - e_categories_dialog_set_categories - e_category_completion_get_type - e_category_completion_new - e_cell_renderer_color_get_type - e_cell_renderer_color_new - e_cell_renderer_safe_toggle_get_type - e_contact_store_add_book - e_contact_store_find_contact - e_contact_store_get_book - e_contact_store_get_books - e_contact_store_get_contact - e_contact_store_get_type - e_contact_store_new - e_contact_store_peek_query - e_contact_store_remove_book - e_contact_store_set_query - e_data_server_ui_marshal_BOOLEAN__BOXED_OBJECT_FLAGS_UINT - e_data_server_ui_marshal_BOOLEAN__OBJECT_BOXED - e_destination_store_append_destination - e_destination_store_get_destination - e_destination_store_get_destination_count - e_destination_store_get_path - e_destination_store_get_type - e_destination_store_insert_destination - e_destination_store_list_destinations - e_destination_store_new - e_destination_store_remove_destination - e_destination_store_remove_destination_nth - e_load_book_source - e_name_selector_dialog_get_type - e_name_selector_dialog_new - e_name_selector_dialog_peek_model - e_name_selector_dialog_set_destination_index - e_name_selector_dialog_set_model - e_name_selector_entry_get_type - e_name_selector_entry_new - e_name_selector_entry_peek_contact_store - e_name_selector_entry_peek_destination_store - e_name_selector_entry_set_contact_editor_func - e_name_selector_entry_set_contact_list_editor_func - e_name_selector_entry_set_contact_store - e_name_selector_entry_set_destination_store - e_name_selector_get_type - e_name_selector_list_expand_clicked - e_name_selector_list_get_type - e_name_selector_list_new - e_name_selector_model_add_section - e_name_selector_model_free_emails_list - e_name_selector_model_get_contact_emails_without_used - e_name_selector_model_get_type - e_name_selector_model_list_sections - e_name_selector_model_new - e_name_selector_model_peek_contact_filter - e_name_selector_model_peek_contact_store - e_name_selector_model_peek_section - e_name_selector_model_remove_section - e_name_selector_new - e_name_selector_peek_dialog - e_name_selector_peek_model - e_name_selector_peek_section_entry - e_name_selector_peek_section_list - e_passwords_add_password - e_passwords_ask_password - e_passwords_cancel - e_passwords_clear_passwords - e_passwords_forget_password - e_passwords_forget_passwords - e_passwords_get_password - e_passwords_init - e_passwords_remember_password - e_passwords_set_online - e_passwords_shutdown - e_source_combo_box_get_active - e_source_combo_box_get_active_uid - e_source_combo_box_get_source_list - e_source_combo_box_get_type - e_source_combo_box_new - e_source_combo_box_set_active - e_source_combo_box_set_active_uid - e_source_combo_box_set_source_list - e_source_option_menu_get_type - e_source_option_menu_new - e_source_option_menu_peek_selected - e_source_option_menu_select - e_source_selector_dialog_get_type - e_source_selector_dialog_new - e_source_selector_dialog_peek_primary_selection - e_source_selector_dialog_select_default_source - e_source_selector_edit_primary_selection - e_source_selector_free_selection - e_source_selector_get_primary_source_group - e_source_selector_get_selection - e_source_selector_get_source_list - e_source_selector_get_type - e_source_selector_new - e_source_selector_peek_primary_selection - e_source_selector_select_source - e_source_selector_selection_shown - e_source_selector_set_primary_selection - e_source_selector_set_select_new - e_source_selector_show_selection - e_source_selector_source_is_selected - e_source_selector_unselect_source - e_tree_model_generator_convert_child_iter_to_iter - e_tree_model_generator_convert_child_path_to_path - e_tree_model_generator_convert_iter_to_child_iter - e_tree_model_generator_convert_path_to_child_path - e_tree_model_generator_get_model - e_tree_model_generator_get_type - e_tree_model_generator_new - e_tree_model_generator_set_generate_func - e_tree_model_generator_set_modify_func - ens_util_populate_user_query_fields - find_contact_source_by_book_return_view -- 2.7.4