-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I filed a bug[1] with a patch (attached) to fix a couple issues building
libnautilus-extension and libnautilus-private on Cygwin, and I was asked
to submit the patch for review. The patch was generated against
nautilus-2.10.1, but should apply to 2.12 and HEAD.
[1] http://bugzilla.gnome.org/show_bug.cgi?id=317629
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFDQGIdpiWmPGlmQSMRArllAKCxXevgRTP0JL6YnFEsyVzsM4S5sgCgxSPW
09wa5AvzG7AIrIrXirhjTco=
=kKGT
-----END PGP SIGNATURE-----
diff -urN -x .build -x .inst -x .sinst -x configure -x 'Makefile.in*' -x
'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x
mkinstalldirs -x 'intltool*' -x autom4te.cache -x '*compile' -x '*stamp' -x
'*html' -x '*sgml' -x '*tmpl' -x '*txt' -x '*xml'
nautilus-2.10.1-orig/libnautilus-extension/Makefile.am
nautilus-2.10.1/libnautilus-extension/Makefile.am
--- nautilus-2.10.1-orig/libnautilus-extension/Makefile.am 2004-01-12
17:46:21.000000000 -0600
+++ nautilus-2.10.1/libnautilus-extension/Makefile.am 2005-09-30
11:31:43.937500000 -0500
@@ -12,10 +12,11 @@
libnautilus_extension_la_LDFLAGS=\
-version-info 1:0:0 \
- $(LIBNAUTILUS_EXTENSION_LIBS) \
-no-undefined \
$(NULL)
+libnautilus_extension_la_LIBADD = $(LIBNAUTILUS_EXTENSION_LIBS)
+
libnautilus_extension_includedir=$(includedir)/nautilus/libnautilus-extension
libnautilus_extension_include_HEADERS= \
diff -urN -x .build -x .inst -x .sinst -x configure -x 'Makefile.in*' -x
'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x
mkinstalldirs -x 'intltool*' -x autom4te.cache -x '*compile' -x '*stamp' -x
'*html' -x '*sgml' -x '*tmpl' -x '*txt' -x '*xml'
nautilus-2.10.1-orig/libnautilus-private/Makefile.am
nautilus-2.10.1/libnautilus-private/Makefile.am
--- nautilus-2.10.1-orig/libnautilus-private/Makefile.am 2005-01-12
06:32:03.000000000 -0600
+++ nautilus-2.10.1/libnautilus-private/Makefile.am 2005-09-30
11:55:03.609375000 -0500
@@ -26,10 +26,13 @@
libnautilus_private_la_LDFLAGS = \
-version-info 2:0:0 \
-no-undefined \
- $(dependency_static_libs) \
- $(CORE_LIBS) \
$(NULL)
+libnautilus_private_la_LIBADD = \
+ $(dependency_static_libs) \
+ $(top_builddir)/libnautilus-extension/libnautilus-extension.la \
+ $(CORE_LIBS)
+
nautilus_metafile_server_idl_sources = \
nautilus-metafile-server-stubs.c \
nautilus-metafile-server-skels.c \
--
nautilus-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/nautilus-list
