diff -Naurp gtk-engines-0.12/metal/Makefile.in gtk-engines-0.12-cygwin/metal/Makefile.in --- gtk-engines-0.12/metal/Makefile.in Thu Mar 15 07:10:55 2001 +++ gtk-engines-0.12-cygwin/metal/Makefile.in Fri Jan 4 09:21:21 2002 @@ -145,6 +145,9 @@ install-engineLTLIBRARIES: $(engine_LTLI if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll"; \ + install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll; \ else :; fi; \ done @@ -152,6 +155,8 @@ uninstall-engineLTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(engine_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + rm -f $(DESTDIR)$(enginedir)/$$dll; \ done .c.o: @@ -194,6 +199,7 @@ maintainer-clean-libtool: libmetal.la: $(libmetal_la_OBJECTS) $(libmetal_la_DEPENDENCIES) $(LINK) -rpath $(enginedir) $(libmetal_la_LDFLAGS) $(libmetal_la_OBJECTS) $(libmetal_la_LIBADD) $(LIBS) + cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libmetal_la_LIBADD) $(LIBS) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. diff -Naurp gtk-engines-0.12/mkdll.sh gtk-engines-0.12-cygwin/mkdll.sh --- gtk-engines-0.12/mkdll.sh Thu Jan 1 00:00:00 1970 +++ gtk-engines-0.12-cygwin/mkdll.sh Fri Jan 4 08:52:34 2002 @@ -0,0 +1,59 @@ +#!/bin/sh + +# script to generate dll from libtool-generated static archive (.la file) +# invoke in .libs directory 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 +module=$(echo $(basename $archive) | sed -e 's,^lib\(.*\).la$,\1,') + +shift +dependency_libs="$@" + +test -n "$CC" || CC=gcc +test -n "$PREFIX" || prefix=/usr/local + +# get the static library name +old_lib=$(sed -ne '/^old_library=/ s,^old_library='\''\(.*\)'\''.*$,\1,p' $archive) + +# update the archive with the dll and import lib name. +if sed -e 's,^dlname='\'\'',dlname='\'cyg${module}.dll\'',;s,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' $archive > ${archive}.tmp +then cat ${archive}.tmp > ${archive} +fi +rm -f ${archive}.tmp + +# update the install archive if it exists +if [ -f ${archive}i ] ; then + if sed -e 's,^dlname='\'\'',dlname='\'cyg${module}.dll\'',;s,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' ${archive}i > ${archive}i.tmp + then cat ${archive}i.tmp > ${archive}i + fi + rm -f ${archive}i.tmp +fi + +# update the archive with the install dir if not already set +#libdir=${prefix}/lib +#if sed -e '/^libdir=/ s,='\'\'',='\'$libdir\'',' $archive > ${archive}.tmp +#then cat ${archive}.tmp > $archive +#fi +#rm -f ${archive}.tmp + + +# 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 +eval $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} + diff -Naurp gtk-engines-0.12/notif/Makefile.in gtk-engines-0.12-cygwin/notif/Makefile.in --- gtk-engines-0.12/notif/Makefile.in Thu Mar 15 07:10:53 2001 +++ gtk-engines-0.12-cygwin/notif/Makefile.in Fri Jan 4 09:21:59 2002 @@ -144,6 +144,9 @@ install-engineLTLIBRARIES: $(engine_LTLI if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll"; \ + install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll; \ else :; fi; \ done @@ -151,6 +154,8 @@ uninstall-engineLTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(engine_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + rm -f $(DESTDIR)$(enginedir)/$$dll; \ done .c.o: @@ -193,6 +198,7 @@ maintainer-clean-libtool: libnotif.la: $(libnotif_la_OBJECTS) $(libnotif_la_DEPENDENCIES) $(LINK) -rpath $(enginedir) $(libnotif_la_LDFLAGS) $(libnotif_la_OBJECTS) $(libnotif_la_LIBADD) $(LIBS) + cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libnotif_la_LIBADD) $(LIBS) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. diff -Naurp gtk-engines-0.12/pixmap/Makefile.in gtk-engines-0.12-cygwin/pixmap/Makefile.in --- gtk-engines-0.12/pixmap/Makefile.in Thu Mar 15 07:10:47 2001 +++ gtk-engines-0.12-cygwin/pixmap/Makefile.in Fri Jan 4 09:22:18 2002 @@ -145,6 +145,9 @@ install-engineLTLIBRARIES: $(engine_LTLI if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll"; \ + install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll; \ else :; fi; \ done @@ -152,6 +155,8 @@ uninstall-engineLTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(engine_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + rm -f $(DESTDIR)$(enginedir)/$$dll; \ done .c.o: @@ -194,6 +199,7 @@ maintainer-clean-libtool: libpixmap.la: $(libpixmap_la_OBJECTS) $(libpixmap_la_DEPENDENCIES) $(LINK) -rpath $(enginedir) $(libpixmap_la_LDFLAGS) $(libpixmap_la_OBJECTS) $(libpixmap_la_LIBADD) $(LIBS) + cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libpixmap_la_LIBADD) $(LIBS) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. diff -Naurp gtk-engines-0.12/raleigh/Makefile.in gtk-engines-0.12-cygwin/raleigh/Makefile.in --- gtk-engines-0.12/raleigh/Makefile.in Thu Mar 15 07:10:57 2001 +++ gtk-engines-0.12-cygwin/raleigh/Makefile.in Fri Jan 4 09:22:44 2002 @@ -144,6 +144,9 @@ install-engineLTLIBRARIES: $(engine_LTLI if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll"; \ + install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll; \ else :; fi; \ done @@ -151,6 +154,8 @@ uninstall-engineLTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(engine_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + rm -f $(DESTDIR)$(enginedir)/$$dll; \ done .c.o: @@ -193,6 +198,7 @@ maintainer-clean-libtool: libraleigh.la: $(libraleigh_la_OBJECTS) $(libraleigh_la_DEPENDENCIES) $(LINK) -rpath $(enginedir) $(libraleigh_la_LDFLAGS) $(libraleigh_la_OBJECTS) $(libraleigh_la_LIBADD) $(LIBS) + cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libraleigh_la_LIBADD) $(LIBS) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. diff -Naurp gtk-engines-0.12/redmond95/Makefile.in gtk-engines-0.12-cygwin/redmond95/Makefile.in --- gtk-engines-0.12/redmond95/Makefile.in Thu Mar 15 07:10:50 2001 +++ gtk-engines-0.12-cygwin/redmond95/Makefile.in Fri Jan 4 09:23:11 2002 @@ -146,6 +146,9 @@ install-engineLTLIBRARIES: $(engine_LTLI if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll"; \ + install -D --mode=755 .libs/$$dll $(DESTDIR)$(enginedir)/$$dll; \ else :; fi; \ done @@ -153,6 +156,8 @@ uninstall-engineLTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(engine_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + rm -f $(DESTDIR)$(enginedir)/$$dll; \ done .c.o: @@ -195,6 +200,7 @@ maintainer-clean-libtool: libredmond95.la: $(libredmond95_la_OBJECTS) $(libredmond95_la_DEPENDENCIES) $(LINK) -rpath $(enginedir) $(libredmond95_la_LDFLAGS) $(libredmond95_la_OBJECTS) $(libredmond95_la_LIBADD) $(LIBS) + cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libredmond95_la_LIBADD) $(LIBS) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile.