diff -Naurp control-center-1.4.0.5/capplets/background-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/background-properties/Makefile.in --- control-center-1.4.0.5/capplets/background-properties/Makefile.in Sat Apr 6 16:51:37 2002 +++ control-center-1.4.0.5-cygwin/capplets/background-properties/Makefile.in Fri Apr 19 12:53:48 2002 @@ -236,9 +236,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/default-applications/Makefile.in control-center-1.4.0.5-cygwin/capplets/default-applications/Makefile.in --- control-center-1.4.0.5/capplets/default-applications/Makefile.in Sat Apr 6 16:52:10 2002 +++ control-center-1.4.0.5-cygwin/capplets/default-applications/Makefile.in Fri Apr 19 13:27:18 2002 @@ -241,9 +241,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/file-types/Makefile.in control-center-1.4.0.5-cygwin/capplets/file-types/Makefile.in --- control-center-1.4.0.5/capplets/file-types/Makefile.in Sat Apr 6 16:52:06 2002 +++ control-center-1.4.0.5-cygwin/capplets/file-types/Makefile.in Fri Apr 19 12:55:13 2002 @@ -184,6 +184,8 @@ file_types_capplet_SOURCES = \ file_types_capplet_LDADD = \ ../../control-center/libcapplet.la \ + $(GNOMEUI_LIBS) \ + $(GNORBA_LIBS) \ $(ORBIT_LIBS) \ $(INTLLIBS) \ $(VFS_LIBS) \ @@ -257,9 +259,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/keyboard-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/keyboard-properties/Makefile.in --- control-center-1.4.0.5/capplets/keyboard-properties/Makefile.in Sat Apr 6 16:52:04 2002 +++ control-center-1.4.0.5-cygwin/capplets/keyboard-properties/Makefile.in Fri Apr 19 12:55:48 2002 @@ -228,9 +228,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/mouse-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/mouse-properties/Makefile.in --- control-center-1.4.0.5/capplets/mouse-properties/Makefile.in Sat Apr 6 16:51:35 2002 +++ control-center-1.4.0.5-cygwin/capplets/mouse-properties/Makefile.in Fri Apr 19 12:56:19 2002 @@ -229,9 +229,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/sound-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/sound-properties/Makefile.in --- control-center-1.4.0.5/capplets/sound-properties/Makefile.in Sat Apr 6 16:51:41 2002 +++ control-center-1.4.0.5-cygwin/capplets/sound-properties/Makefile.in Fri Apr 19 12:56:55 2002 @@ -229,9 +229,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/theme-switcher/Makefile.in control-center-1.4.0.5-cygwin/capplets/theme-switcher/Makefile.in --- control-center-1.4.0.5/capplets/theme-switcher/Makefile.in Sat Apr 6 16:51:39 2002 +++ control-center-1.4.0.5-cygwin/capplets/theme-switcher/Makefile.in Fri Apr 19 12:57:34 2002 @@ -243,9 +243,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/theme-switcher/lister.c control-center-1.4.0.5-cygwin/capplets/theme-switcher/lister.c --- control-center-1.4.0.5/capplets/theme-switcher/lister.c 2002-02-10 20:59:54.000000000 +0000 +++ control-center-1.4.0.5-cygwin/capplets/theme-switcher/lister.c 2002-06-06 18:14:40.000000000 +0100 @@ -114,12 +114,16 @@ edit_file_to_use (gchar *file, gchar *th FILE *fout = NULL; char *errstring = NULL; int out_fd; +#ifndef __CYGWIN__ #ifndef HAVE_GETLINE char line[1024]; char *lineptr = line; #else char *lineptr = NULL; #endif +#else + char *lineptr = malloc(1024 * sizeof(char)); +#endif size_t linecount = 0; gchar *template = g_strconcat (file, "-XXXXXX", NULL); @@ -341,7 +346,7 @@ set_tmp_rc(void) gchar *origfile = NULL; gchar *home; gchar *template = NULL; - int in_fd, out_fd; + int in_fd = -1 , out_fd = -1; char *errstring = NULL; home = g_get_home_dir (); @@ -386,6 +390,12 @@ set_tmp_rc(void) gtkrc_tmp = template; error: + if (in_fd >= 0) + close(in_fd); + + if (out_fd >= 0) + close(out_fd); + g_free (origfile); if (errstring) diff -Naurp control-center-1.4.0.5/capplets/ui-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/ui-properties/Makefile.in --- control-center-1.4.0.5/capplets/ui-properties/Makefile.in Sat Apr 6 16:51:48 2002 +++ control-center-1.4.0.5-cygwin/capplets/ui-properties/Makefile.in Fri Apr 19 12:58:14 2002 @@ -233,9 +233,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/url-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/url-properties/Makefile.in --- control-center-1.4.0.5/capplets/url-properties/Makefile.in Sat Apr 6 16:51:51 2002 +++ control-center-1.4.0.5-cygwin/capplets/url-properties/Makefile.in Fri Apr 19 12:58:47 2002 @@ -229,9 +229,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/capplets/wm-properties/Makefile.in control-center-1.4.0.5-cygwin/capplets/wm-properties/Makefile.in --- control-center-1.4.0.5/capplets/wm-properties/Makefile.in Sat Apr 6 16:51:53 2002 +++ control-center-1.4.0.5-cygwin/capplets/wm-properties/Makefile.in Fri Apr 19 12:59:21 2002 @@ -238,9 +238,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/configure control-center-1.4.0.5-cygwin/configure --- control-center-1.4.0.5/configure Sat Apr 6 16:40:28 2002 +++ control-center-1.4.0.5-cygwin/configure Fri Apr 19 13:39:22 2002 @@ -3681,7 +3681,8 @@ EOF else $CC -o impgen impgen.c ; fi)~ $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' +# old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' +old_archive_from_expsyms_cmds= # cygwin and mingw dlls have different entry points and sets of symbols # to exclude. @@ -5378,7 +5379,8 @@ old_postuninstall_cmds=$lt_old_postunins old_archive_from_new_cmds=$lt_old_archive_from_new_cmds # Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +old_archive_from_expsyms_cmds= # Commands used to build and install a shared archive. archive_cmds=$lt_archive_cmds @@ -8592,7 +8594,7 @@ if eval "test \"`echo '$ac_cv_header_'$a cat >> confdefs.h <&6 fi @@ -8629,7 +8631,7 @@ if test "x$PIXBUF_CFLAGS" != x ; then fi -CFLAGS="`gnome-config --cflags gdk_pixbuf`${CFLAGS}" +CFLAGS="`gnome-config --cflags gdk_pixbuf` ${CFLAGS}" have_libesd=no # Check whether --with-esd-prefix or --without-esd-prefix was given. diff -Naurp control-center-1.4.0.5/control-center/Makefile.in control-center-1.4.0.5-cygwin/control-center/Makefile.in --- control-center-1.4.0.5/control-center/Makefile.in Sat Apr 6 16:51:20 2002 +++ control-center-1.4.0.5-cygwin/control-center/Makefile.in Fri Apr 19 12:42:51 2002 @@ -219,7 +219,7 @@ libcapplet_la_SOURCES = \ libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) +libcapplet_la_LIBADD = $(ORB_LIBS) $(DL_LIB) $(GNORBA_LIBS) libcappletincludedir = $(includedir)/libcapplet1 libcappletinclude_HEADERS = capplet-widget.h @@ -348,6 +348,7 @@ maintainer-clean-libtool: libcapplet.la: $(libcapplet_la_OBJECTS) $(libcapplet_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libcapplet_la_LDFLAGS) $(libcapplet_la_OBJECTS) $(libcapplet_la_LIBADD) $(LIBS) + PREFIX=$(prefix) sh $(top_srcdir)/mkdll.sh $@ $(libcapplet_la_LIBADD) $(LIBS) mostlyclean-binPROGRAMS: @@ -362,9 +363,9 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + if test -f .libs/$$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) .libs/$$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff -Naurp control-center-1.4.0.5/mkdll.sh control-center-1.4.0.5-cygwin/mkdll.sh --- control-center-1.4.0.5/mkdll.sh Thu Jan 1 00:00:00 1970 +++ control-center-1.4.0.5-cygwin/mkdll.sh Fri Apr 19 13:39:22 2002 @@ -0,0 +1,68 @@ +#!/bin/sh + +# script to generate dll from libtool-generated static archive (.la file) +# invoke with: +# mkdll.sh +# eg: +# mkdll.sh libtest.la -L/usr/local/lib -llocal + +# defaults to using gcc for libraries written in C. +# set the CC env var to use a different compiler driver: eg +# export CC=g++ +# for C++ libraries + +# defaults to using /usr/local as the installation PREFIX +# override this by setting the PREFIX env var: eg +# export PREFIX=/opt/gnome + +archive=$1 +test -f $archive || { echo $(basename $0): $archive not found; exit 1; } + +module=$(echo $(basename $archive) | sed -e 's,^lib\(.*\).la$,\1,') + +shift +dependency_libs="$@" + +test -n "$CC" || CC=gcc +prefix=${PREFIX:=/usr/local} + +# get the static library name +# first look in the .la archive +old_lib=$(sed -ne '/^old_library=/ s,^old_library='\''\(.*\)'\''.*$,\1,p' .libs/$archive) +# if not there, use default name +test -n "$old_lib" || old_lib=lib${module}.a + + + +# update the archive with the dll and import lib name; fix install dir; remove relink command +# (${prefix}/lib is hard-coded here - edit it if necessary) +libdir=${prefix}/lib +if sed -e 's,^dlname='\'\'',dlname='\'cyg${module}.dll\'',' \ + -e 's,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' \ + -e '/^libdir=/ s,='\'\'',='\'$libdir\'',' \ + -e '/^relink_command=/ s,^$,,' \ + .libs/$archive > .libs/${archive}.tmp +then cat .libs/${archive}.tmp > .libs/${archive} +fi +rm -f .libs/${archive}.tmp + +# update the install archive if it exists +if [ -f .libs/${archive}i ] ; then + if sed -e 's,^dlname='\'\'',dlname='\'../bin/cyg${module}.dll\'',' \ + -e 's,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' \ + -e '/^relink_command=/ s,^$,,' \ + .libs/${archive}i > .libs/${archive}i.tmp + then cat .libs/${archive}i.tmp > .libs/${archive}i + fi + rm -f .libs/${archive}i.tmp +fi + + +# report the link command to stdout +eval echo $CC -shared -o cyg${module}.dll -Wl,--out-implib=lib${module}.dll.a \ +-Wl,--export-all-symbols -Wl,--whole-archive $old_lib -Wl,--no-whole-archive ${dependency_libs} + +# do the link command - if it fails, remove archive so make knows to re-build it +eval $CC -shared -o .libs/cyg${module}.dll -Wl,--out-implib=.libs/lib${module}.dll.a -Wl,--export-all-symbols \ +-Wl,--whole-archive .libs/$old_lib -Wl,--no-whole-archive ${dependency_libs} || { rm -f $archive; false; } +