aboutsummaryrefslogtreecommitdiff
blob: db07fabeb906d6af61fa861db4b2a4d0b26009d6 (plain)
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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
--- emacs-18.59-orig/etc/ChangeLog
+++ emacs-18.59/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-19  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Makefile: Respect LDFLAGS.
+
 2009-05-29  Ulrich Mueller  <ulm@gentoo.org>
 
 	* etags.c (etags_getline): Renamed from getline, fixes compilation
--- emacs-18.59-orig/etc/Makefile
+++ emacs-18.59/etc/Makefile
@@ -25,35 +25,35 @@
 	./test-distrib
 
 etags: etags.c
-	$(CC) -o etags ${CFLAGS} -DETAGS etags.c $(LOADLIBES)
+	$(CC) -o etags ${CFLAGS} ${LDFLAGS} -DETAGS etags.c $(LOADLIBES)
 
 ctags: etags.c
-	$(CC) -o ctags ${CFLAGS} -DCTAGS etags.c $(LOADLIBES)
+	$(CC) -o ctags ${CFLAGS} ${LDFLAGS} -DCTAGS etags.c $(LOADLIBES)
 
 wakeup: wakeup.c
-	$(CC) -o wakeup ${CFLAGS} wakeup.c $(LOADLIBES)
+	$(CC) -o wakeup ${CFLAGS} ${LDFLAGS} wakeup.c $(LOADLIBES)
 
 make-docfile: make-docfile.c
-	$(CC) -o make-docfile ${CFLAGS} make-docfile.c $(LOADLIBES)
+	$(CC) -o make-docfile ${CFLAGS} ${LDFLAGS} make-docfile.c $(LOADLIBES)
 
 digest-doc: digest-doc.c
-	$(CC) -o digest-doc ${CFLAGS} digest-doc.c $(LOADLIBES)
+	$(CC) -o digest-doc ${CFLAGS} ${LDFLAGS} digest-doc.c $(LOADLIBES)
 
 sorted-doc: sorted-doc.c
-	$(CC) -o sorted-doc ${CFLAGS} sorted-doc.c $(LOADLIBES)
+	$(CC) -o sorted-doc ${CFLAGS} ${LDFLAGS} sorted-doc.c $(LOADLIBES)
 
 #
 movemail: movemail.c ../src/config.h
-	$(CC) -o movemail ${CFLAGS} movemail.c $(LOADLIBES)
+	$(CC) -o movemail ${CFLAGS} ${LDFLAGS} movemail.c $(LOADLIBES)
 
 cvtmail: cvtmail.c
-	$(CC) -o cvtmail ${CFLAGS} cvtmail.c $(LOADLIBES)
+	$(CC) -o cvtmail ${CFLAGS} ${LDFLAGS} cvtmail.c $(LOADLIBES)
 
 fakemail: fakemail.c ../src/config.h
-	$(CC) -o fakemail ${CFLAGS} fakemail.c $(LOADLIBES)
+	$(CC) -o fakemail ${CFLAGS} ${LDFLAGS} fakemail.c $(LOADLIBES)
 
 yow: yow.c ../src/paths.h
-	$(CC) -o yow ${CFLAGS} yow.c $(LOADLIBES)
+	$(CC) -o yow ${CFLAGS} ${LDFLAGS} yow.c $(LOADLIBES)
 
 # this is silly -- just use emacs to edit this file!
 # (in any case this program doesn't preserve alphabetical ordering,
@@ -62,26 +62,26 @@
 #	$(CC) -o addyow ${CFLAGS} addyow.c
 
 env: env.c ../src/config.h
-	$(CC) -o env -DEMACS ${CFLAGS} env.c $(LOADLIBES)
+	$(CC) -o env -DEMACS ${CFLAGS} ${LDFLAGS} env.c $(LOADLIBES)
 
 server: server.c ../src/config.h
-	$(CC) -o server ${CFLAGS} server.c $(LOADLIBES)
+	$(CC) -o server ${CFLAGS} ${LDFLAGS} server.c $(LOADLIBES)
 
 emacsclient: emacsclient.c ../src/config.h
-	$(CC) -o emacsclient ${CFLAGS} emacsclient.c $(LOADLIBES)
+	$(CC) -o emacsclient ${CFLAGS} ${LDFLAGS} emacsclient.c $(LOADLIBES)
 
 # This one is NOT included in EXECUTABLES.
 # See ../src/ymakefile.
 emacstool: emacstool.c
-	$(CC) -o emacstool ${CFLAGS} emacstool.c -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
+	$(CC) -o emacstool ${CFLAGS} ${LDFLAGS} emacstool.c -lsuntool -lsunwindow -lpixrect $(LOADLIBES)
 
 nemacstool: emacstool.c
-	$(CC) -o nemacstool ${CFLAGS} -DJLE emacstool.c -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)	# For SUN Japanese Language Environment
+	$(CC) -o nemacstool ${CFLAGS} ${LDFLAGS} -DJLE emacstool.c -lsuntool -lmle -lsunwindow -lpixrect $(LOADLIBES)	# For SUN Japanese Language Environment
 
 xvetool: emacstool.c
-	$(CC) -o xvetool ${CFLAGS} -DXVIEW         emacstool.c -lxview -lolgx -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib $(LOADLIBES)
+	$(CC) -o xvetool ${CFLAGS} ${LDFLAGS} -DXVIEW         emacstool.c -lxview -lolgx -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib $(LOADLIBES)
 
 xveterm: emacstool.c
-	$(CC) -o xveterm ${CFLAGS} -DXVIEW -DTTERM emacstool.c -lxview -lolgx -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib $(LOADLIBES)
+	$(CC) -o xveterm ${CFLAGS} ${LDFLAGS} -DXVIEW -DTTERM emacstool.c -lxview -lolgx -lX -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib $(LOADLIBES)