summaryrefslogtreecommitdiff
path: root/audio/xwave/files/patch-aa
blob: 88a801c071c2fa521f8c8feaccbdae296b211f4d (plain) (blame)
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
   If /usr/X11R6/lib/libfwf.a exists on the system, (e.g. as a consequence
   of building the port /usr/ports/x11-toolkits/FWF before), xwave
   links this file instead of its own (older) libfwf.a.

   In src/Imakefile the line

     XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11

   cannot guarantee, that libfwf.a is taken from ../lib, because imake
   includes -L/usr/X11R6/lib _BEFORE_ -L../lib.

   I am not experienced in compiler options, but replacing the above line
   by

     XLIBS= ../lib/libfwf.a -lXaw -lXpm -lXmu -lXt -lX11

   does the job.

--- src/Imakefile.orig	Mon Nov  9 00:22:55 1998
+++ src/Imakefile	Mon Jan  1 12:49:37 2001
@@ -13,8 +13,14 @@
 PROGRAMS= xwave
 
 AUDIOLIBS=-L../ccitt -lccitt -L../adpcm2pcm -ladpcm -L../ieee -lieee
-XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11
-LIBS=  $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc 
+
+# XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11
+# "-L../lib -lfwf" substituted by "../lib/libfwf.a" because Linker
+# used /usr/X11R6/lib/libfwf.a on systems, where this file exists.
+# 2001-01-01 Martin Kraft
+
+XLIBS= ../lib/libfwf.a -lXaw -lXpm -lXmu -lXt -lX11
+LIBS=  $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm
 
 NormalProgramTarget(xwave,$(OBJS),,$(LIBS),)