Attachment 36725 Details for Bug 7107 – 0007-autotools-Fix-compile-warnings-on-auto-imports-for-m.patch

[patch] 0007-autotools-Fix-compile-warnings-on-auto-imports-for-m.patch

0007-autotools-Fix-compile-warnings-on-auto-imports-for-m.patch (text/plain), 2.79 KB, created by Hib Eris on 2010-07-03 08:36:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2010-07-03 08:36:06 UTC

Size: 2.79 KB

patch

obsolete

>From 8f1a6d9f1e5eab1277d41485004d2b7f9ec2b5a1 Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>Date: Fri, 2 Jul 2010 10:53:20 +0200
>Subject: [PATCH 07/15] [autotools] Fix compile warnings on auto imports for mingw compiler
>
>---
> cpp/Makefile.am       |    2 +-
> cpp/tests/Makefile.am |    2 ++
> glib/Makefile.am      |    2 ++
> poppler/Makefile.am   |    2 +-
> qt4/demos/Makefile.am |    2 ++
> qt4/src/Makefile.am   |    2 +-
> qt4/tests/Makefile.am |    2 ++
> 7 files changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/cpp/Makefile.am b/cpp/Makefile.am
>index d8891db..dda683a 100644
>--- a/cpp/Makefile.am
>+++ b/cpp/Makefile.am
>@@ -42,4 +42,4 @@ libpoppler_cpp_la_LIBADD = 			\
> 	$(top_builddir)/poppler/libpoppler.la	\
> 	$(LIBICONV)
> 
>-libpoppler_cpp_la_LDFLAGS = -version-info 1:0:1 @create_shared_lib@
>+libpoppler_cpp_la_LDFLAGS = -version-info 1:0:1 @create_shared_lib@ @auto_import_flags@
>diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
>index d2544a5..5066889 100644
>--- a/cpp/tests/Makefile.am
>+++ b/cpp/tests/Makefile.am
>@@ -1,3 +1,5 @@
>+AM_LDFLAGS = @auto_import_flags@
>+
> INCLUDES =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/utils			\
>diff --git a/glib/Makefile.am b/glib/Makefile.am
>index 2b0fadd..32ce952 100644
>--- a/glib/Makefile.am
>+++ b/glib/Makefile.am
>@@ -1,3 +1,5 @@
>+AM_LDFLAGS = @auto_import_flags@
>+
> SUBDIRS = . reference demo
> INCLUDES =					\
> 	-DG_LOG_DOMAIN=\"Poppler\"		\
>diff --git a/poppler/Makefile.am b/poppler/Makefile.am
>index 5f8f7fb..5da63f0 100644
>--- a/poppler/Makefile.am
>+++ b/poppler/Makefile.am
>@@ -176,7 +176,7 @@ libpoppler_la_LIBADD =				\
> 	$(PTHREAD_LIBS)				\
> 	$(win32_libs)
> 
>-libpoppler_la_LDFLAGS = -version-info 6:0:0 @create_shared_lib@
>+libpoppler_la_LDFLAGS = -version-info 6:0:0 @create_shared_lib@ @auto_import_flags@
> 
> if ENABLE_XPDF_HEADERS
> 
>diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
>index c3f636c..50486b8 100644
>--- a/qt4/demos/Makefile.am
>+++ b/qt4/demos/Makefile.am
>@@ -1,3 +1,5 @@
>+AM_LDFLAGS = @auto_import_flags@
>+
> INCLUDES =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
>diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
>index 5c921bb..47a2606 100644
>--- a/qt4/src/Makefile.am
>+++ b/qt4/src/Makefile.am
>@@ -60,7 +60,7 @@ libpoppler_qt4_la_LIBADD = 			\
> 	$(FONTCONFIG_LIBS)				\
> 	$(POPPLER_QT4_LIBS)
> 
>-libpoppler_qt4_la_LDFLAGS = -version-info 6:0:3 @create_shared_lib@
>+libpoppler_qt4_la_LDFLAGS = -version-info 6:0:3 @create_shared_lib@ @auto_import_flags@
> 
> # This rule lets GNU make create any *.moc from the equivalent *.h
> .h.moc:
>diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
>index 763b177..7bc16d7 100644
>--- a/qt4/tests/Makefile.am
>+++ b/qt4/tests/Makefile.am
>@@ -1,3 +1,5 @@
>+AM_LDFLAGS = @auto_import_flags@
>+
> INCLUDES =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
>-- 
>1.6.4.2
>

Actions: View | Splinter Review

Attachments on bug 7107: 5799 | 5801 | 7314 | 34268 | 36628 | 36629 | 36682 | 36683 | 36684 | 36685 | 36686 | 36725 | 36726 | 36727

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.