aboutsummaryrefslogtreecommitdiffstats
path: root/misc/estic/files/patch-estic-freebsd-x.mak
blob: 4582aa733c084bd0991ed0fd04b18e6332b55178 (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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- estic/make/freebsd-x.mak.orig   Fri Jan 31 03:57:24 1997
+++ estic/make/freebsd-x.mak    Tue Sep  6 09:54:21 2005
@@ -27,12 +27,13 @@
 AR = ar
 LD = ld
 ZIP = zip
-CC = g++
+CXX ?= g++
+CC = ${CXX}
 
 LIB    = ../spunk/spunk.a
 INCDIR = ../spunk
 
-CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
+CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(LOCALBASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
 
 
 # ------------------------------------------------------------------------------
@@ -71,10 +72,10 @@
        icintcon.o  \
        iclog.o     \
        icmsgwin.o  \
-       icprefix.o  \
        icshort.o   \
        icver.o     \
-       istecmsg.o
+       istecmsg.o  \
+       ../areacode/areacode.o
 
 # ------------------------------------------------------------------------------
 #
@@ -82,7 +83,7 @@
 all:   xestic
 
 xestic: $(LIB) $(OBJS)
-   $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
+   $(CC) -L $(LOCALBASE)/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11
 
 
 # ------------------------------------------------------------------------------
@@ -114,10 +115,10 @@
 
 clean:
    -rm -f *.bak *~
+   -rm -f *.o
+   -rm -f xestic
 
 zap:   clean
-   -rm -f *.o
    -rm -f .depend
-