summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2005-10-18 08:48:56 +0000
committerAlexander Larsson <alexl@src.gnome.org>2005-10-18 08:48:56 +0000
commit551994e5f7610fd3dc8517ebdcfa7da2a2f02a4c (patch)
tree1636929d81cdba6eb02b93a4f78aea8ca696836f
parent38a5fd96a672345fed755a15efa2cf344a16fd17 (diff)
downloadnautilus-551994e5f7610fd3dc8517ebdcfa7da2a2f02a4c.tar.gz
Build fixes for cygwin. Patch from Yaakov S (Cygwin Port)
2005-10-18 Alexander Larsson <alexl@redhat.com> * libnautilus-extension/Makefile.am: * libnautilus-private/Makefile.am: Build fixes for cygwin. Patch from Yaakov S (Cygwin Port)
-rw-r--r--ChangeLog6
-rw-r--r--libnautilus-extension/Makefile.am3
-rw-r--r--libnautilus-private/Makefile.am7
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b1d23c9c..c024d9872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-18 Alexander Larsson <alexl@redhat.com>
+
+ * libnautilus-extension/Makefile.am:
+ * libnautilus-private/Makefile.am:
+ Build fixes for cygwin.
+
2005-10-17 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-bookmark.c:
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index 22616b9b8..4d00df497 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -12,10 +12,11 @@ INCLUDES=\
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 --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index d9c158d50..a3b8c3e5a 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -26,10 +26,13 @@ dependency_static_libs = \
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 \