Description: enable linking with --as-needed
Author: Stefan Potyra <sistpoty@ubuntu.com>
Integrated: Ralf Treinen <treinen@debian.org>
Debian-bug: 607530:

Index: advi/src/Makefile.am
===================================================================
--- advi.orig/src/Makefile.am	2011-01-04 03:07:45.000000000 +0100
+++ advi/src/Makefile.am	2011-02-09 22:03:54.000000000 +0100
@@ -75,7 +75,7 @@
 COBJS           = $(CSOURCES:.c=.o)
 
 AM_CFLAGS	= $(XINERAMA_CFLAGS) $(X_CFLAGS)
-AM_LINKFLAGS	= $(XINERAMA_LIBS)
+LDADD		= $(XINERAMA_LIBS)
 AM_OCAMLCFLAGS	= $(CAMLIMAGES_INCLUDES)
 
 OTHER_LIBS	= unix str
@@ -85,12 +85,12 @@
 advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
 	$(OCAMLOPT) -o advi$(EXEEXT) \
 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
-		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
+		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(LDADD)
 
 advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
 	$(OCAMLC) -o advi.byt$(EXEEXT) \
 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
-		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
+		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(LDADD)
 
 install_hook: $(INSTALLEXEC) installdata
 	- texhash
Index: advi/src/Makefile.in
===================================================================
--- advi.orig/src/Makefile.in	2011-01-04 03:07:45.000000000 +0100
+++ advi/src/Makefile.in	2011-02-09 22:03:54.000000000 +0100
@@ -253,7 +253,7 @@
 OCAMLOPTOBJS = $(OCAMLBUILTSOURCES:.ml=.cmx) $(OCAMLSOURCES:.ml=.cmx)
 COBJS = $(CSOURCES:.c=.o)
 AM_CFLAGS = $(XINERAMA_CFLAGS) $(X_CFLAGS)
-AM_LINKFLAGS = $(XINERAMA_LIBS)
+LDADD = $(XINERAMA_LIBS)
 AM_OCAMLCFLAGS = $(CAMLIMAGES_INCLUDES)
 OTHER_LIBS = unix str
 OCAMLLIBS_OPT = $(CAMLIMAGES_LIBS_NATIVE) $(OTHER_LIBS:=.cmxa)
@@ -519,12 +519,12 @@
 advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
 	$(OCAMLOPT) -o advi$(EXEEXT) \
 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
-		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
+		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(LDADD)
 
 advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
 	$(OCAMLC) -o advi.byt$(EXEEXT) \
 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
-		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
+		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(LDADD)
 
 install_hook: $(INSTALLEXEC) installdata
 	- texhash
