diff --git a/pkg.c b/pkg.c index 9695e3e..d0394c3 100644 --- a/pkg.c +++ b/pkg.c @@ -586,45 +586,6 @@ recursive_fill_list (Package *pkg, GetListFunc func, GSList **listp) } } -static void -fill_list_single_package (Package *pkg, GetListFunc func, - GSList **listp, gboolean in_path_order, - gboolean include_private) -{ - /* First we get the list in natural/recursive order, then - * stable sort by path position - */ - GSList *packages; - GSList *tmp; - - /* Get list of packages */ - packages = NULL; - packages = g_slist_append (packages, pkg); - recursive_fill_list (pkg, - include_private ? get_requires_private : get_requires, - &packages); - - if (in_path_order) - { - spew_package_list ("original", packages); - - packages = packages_sort_by_path_position (packages); - - spew_package_list ("sorted", packages); - } - - /* Convert package list to string list */ - tmp = packages; - while (tmp != NULL) - { - fill_one_level (tmp->data, func, listp); - - tmp = tmp->next; - } - - g_slist_free (packages); -} - static void fill_list (GSList *packages, GetListFunc func, GSList **listp, gboolean in_path_order, gboolean include_private) @@ -929,50 +890,6 @@ verify_package (Package *pkg) } } -static char* -get_merged (Package *pkg, GetListFunc func, gboolean in_path_order, - gboolean include_private) -{ - GSList *list; - GSList *dups_list = NULL; - char *retval; - - fill_list_single_package (pkg, func, &dups_list, in_path_order, - include_private); - - list = string_list_strip_duplicates (dups_list); - - g_slist_free (dups_list); - - retval = string_list_to_string (list); - - g_slist_free (list); - - return retval; -} - -static char* -get_merged_from_back (Package *pkg, GetListFunc func, gboolean in_path_order, - gboolean include_private) -{ - GSList *list; - GSList *dups_list = NULL; - char *retval; - - fill_list_single_package (pkg, func, &dups_list, in_path_order, - include_private); - - list = string_list_strip_duplicates_from_back (dups_list); - - g_slist_free (dups_list); - - retval = string_list_to_string (list); - - g_slist_free (list); - - return retval; -} - static char* get_multi_merged (GSList *pkgs, GetListFunc func, gboolean in_path_order, gboolean include_private) @@ -1015,19 +932,6 @@ get_multi_merged_from_back (GSList *pkgs, GetListFunc func, return retval; } -char * -package_get_l_libs (Package *pkg) -{ - /* We don't want these in search path order, rather in dependency - * order, so static linking works. - */ - if (pkg->l_libs_merged == NULL) - pkg->l_libs_merged = get_merged_from_back (pkg, get_l_libs, FALSE, - !ignore_private_libs); - - return pkg->l_libs_merged; -} - char * packages_get_l_libs (GSList *pkgs) { @@ -1035,33 +939,12 @@ packages_get_l_libs (GSList *pkgs) !ignore_private_libs); } -char * -package_get_L_libs (Package *pkg) -{ - /* We want these in search path order so the -L flags don't override PKG_CONFIG_PATH */ - if (pkg->L_libs_merged == NULL) - pkg->L_libs_merged = get_merged (pkg, get_L_libs, TRUE, - !ignore_private_libs); - - return pkg->L_libs_merged; -} - char * packages_get_L_libs (GSList *pkgs) { return get_multi_merged (pkgs, get_L_libs, TRUE, !ignore_private_libs); } -char * -package_get_other_libs (Package *pkg) -{ - if (pkg->other_libs_merged == NULL) - pkg->other_libs_merged = get_merged (pkg, get_other_libs, TRUE, - !ignore_private_libs); - - return pkg->other_libs_merged; -} - char * packages_get_other_libs (GSList *pkgs) { @@ -1103,16 +986,6 @@ packages_get_all_libs (GSList *pkgs) return retval; } -char * -package_get_I_cflags (Package *pkg) -{ - /* sort by path position so PKG_CONFIG_PATH affects -I flag order */ - if (pkg->I_cflags_merged == NULL) - pkg->I_cflags_merged = get_merged (pkg, get_I_cflags, TRUE, FALSE); - - return pkg->I_cflags_merged; -} - char * packages_get_I_cflags (GSList *pkgs) { @@ -1120,29 +993,12 @@ packages_get_I_cflags (GSList *pkgs) return get_multi_merged (pkgs, get_I_cflags, TRUE, TRUE); } -char * -package_get_other_cflags (Package *pkg) -{ - if (pkg->other_cflags_merged == NULL) - pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, TRUE); - - return pkg->other_cflags_merged; -} - char * packages_get_other_cflags (GSList *pkgs) { return get_multi_merged (pkgs, get_other_cflags, TRUE, TRUE); } -char * -package_get_cflags (Package *pkg) -{ - - g_assert_not_reached (); - return NULL; -} - char * packages_get_all_cflags (GSList *pkgs) { diff --git a/pkg.h b/pkg.h index ef18af0..eeb5466 100644 --- a/pkg.h +++ b/pkg.h @@ -55,15 +55,10 @@ struct _Package GSList *requires; GSList *requires_private; GSList *l_libs; - char *l_libs_merged; GSList *L_libs; - char *L_libs_merged; GSList *other_libs; - char *other_libs_merged; GSList *I_cflags; - char *I_cflags_merged; GSList *other_cflags; - char *other_cflags_merged; GHashTable *vars; GHashTable *required_versions; /* hash from name to RequiredVersion */ GSList *conflicts; /* list of RequiredVersion */ @@ -75,16 +70,11 @@ struct _Package Package *get_package (const char *name); Package *get_package_quiet (const char *name); -char * package_get_l_libs (Package *pkg); char * packages_get_l_libs (GSList *pkgs); -char * package_get_L_libs (Package *pkg); char * packages_get_L_libs (GSList *pkgs); -char * package_get_other_libs (Package *pkg); char * packages_get_other_libs (GSList *pkgs); char * packages_get_all_libs (GSList *pkgs); -char * package_get_I_cflags (Package *pkg); char * packages_get_I_cflags (GSList *pkgs); -char * package_get_other_cflags (Package *pkg); char * packages_get_other_cflags (GSList *pkgs); char * packages_get_all_cflags (GSList *pkgs); char * package_get_var (Package *pkg,