Package: deal / 3.1.9-12

Makefile Patch series | download
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
Make.ubuntu: Remove -L/usr/lib so we don't pick up bad libs on multiarch systems. (Closes: #722762)

--- a/Make.ubuntu
+++ b/Make.ubuntu
@@ -2,9 +2,9 @@
 DEBUG_FLAGS=-g -ansi -Wall -O2
 CPPFLAGS = -fno-rtti -g -O2
 
-# Ubuntu settings
-TCL_VERSION=8.5
+# Debian settings
+TCL_VERSION=""
 TCL_INCL=/usr/include/tcl$(TCL_VERSION)
 TCL_LIB=/usr/lib
-LDFLAGS=  -L$(TCL_LIB) -ltcl$(TCL_VERSION) -lm
+LDFLAGS= -ltcl$(TCL_VERSION) -lm
 
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@
 
 TCL_DIR=/usr
 
-include Make.mac-osx
-#include Make.ubuntu
+#include Make.mac-osx
+include Make.ubuntu
 
 CC=gcc
 
@@ -56,7 +56,7 @@
 BINARY=./deal
 
 deal: $(OBJS)
-	g++ $(CFLAGS) $(OBJS) -o deal $(LDFLAGS)
+	g++ $(CFLAGS) $(OBJS) -o deal $(LDFLAGS) $(EXTRA_LDFLAGS)
 
 universal:
 	$(MAKE) clean
@@ -223,6 +223,6 @@
 	$(CC) $(CFLAGS) -M *.c *.cpp >Make.dep
 
 clean:
-	rm -rf deal $(OBJS) $(SRCDIR) $(SRCZIP) $(SRCGZIP) $(DOCZIP) $(DMG) $(EXEZIP) $(BINDIR) counttable.c makecounttable makecounttable.o html site
+	rm -rf deal $(OBJS) $(SRCDIR) $(SRCZIP) $(SRCGZIP) $(DOCZIP) $(DMG) $(EXEZIP) $(BINDIR) counttable.c makecounttable makecounttable.o site
 
 include Make.dep