~ubuntu-branches/ubuntu/natty/zoem/natty

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
## Description: Use zoem_LDADD instead of zoem_LDFLAGS for passing -lm to the linker in src/Makefile.{am,in}.
## Author: Mahyuddin Susanto <udienz@ubuntu.com>
## Bug: https://launchpad.net/+bug/717624

Index: zoem-10-265/src/Makefile.in
===================================================================
--- zoem-10-265.orig/src/Makefile.in	2011-02-12 16:38:48.096475025 +0700
+++ zoem-10-265/src/Makefile.in	2011-02-12 16:38:46.512992346 +0700
@@ -56,7 +56,7 @@
 	ops.$(OBJEXT) parse.$(OBJEXT) read.$(OBJEXT) segment.$(OBJEXT) \
 	util.$(OBJEXT) zoem.$(OBJEXT) version.$(OBJEXT)
 zoem_OBJECTS = $(am_zoem_OBJECTS)
-zoem_LDADD = $(LDADD)
+zoem_LDADD = $(LDADD) -lm
 zoem_DEPENDENCIES = ../util/libutil.a
 zoem_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(zoem_LDFLAGS) $(LDFLAGS) \
 	-o $@
@@ -169,7 +169,6 @@
 iface.c source.c sink.c filter.c key.c dict.c ops.c parse.c read.c \
 segment.c util.c zoem.c version.c
 
-zoem_LDFLAGS = -lm
 LDADD = ../util/libutil.a
 EXTRA_DIST = curly.h digest.h entry.h parse.h segment.h key.h dict.h \
 source.h sink.h read.h util.h filter.h iface.h zlimits.h version.h \
@@ -249,7 +248,7 @@
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 zoem$(EXEEXT): $(zoem_OBJECTS) $(zoem_DEPENDENCIES) 
 	@rm -f zoem$(EXEEXT)
-	$(zoem_LINK) $(zoem_OBJECTS) $(zoem_LDADD) $(LIBS)
+	$(LINK) $(zoem_OBJECTS) $(zoem_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)