62 lines
1.6 KiB
Text
62 lines
1.6 KiB
Text
$NetBSD: patch-af,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
|
|
|
|
--- make/freebsd-x.mak.orig Fri Jan 31 03:57:24 1997
|
|
+++ make/freebsd-x.mak Sat Feb 10 18:38:34 2001
|
|
@@ -27,22 +27,20 @@
|
|
AR = ar
|
|
LD = ld
|
|
ZIP = zip
|
|
-CC = g++
|
|
|
|
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 -Wall -I$(INCDIR) -fno-implicit-templates -DEXPLICIT_TEMPLATES
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Implicit rules
|
|
|
|
.c.o:
|
|
- $(CC) $(CFLAGS) -c $<
|
|
+ $(CC) $(CFLAGS) -c $< -o $@
|
|
|
|
.cc.o:
|
|
- $(CC) $(CFLAGS) -c $<
|
|
+ $(CXX) $(CFLAGS) -c $< -o $@
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# All OBJ files
|
|
@@ -71,18 +69,19 @@
|
|
icintcon.o \
|
|
iclog.o \
|
|
icmsgwin.o \
|
|
- icprefix.o \
|
|
icshort.o \
|
|
icver.o \
|
|
istecmsg.o
|
|
|
|
+ACOBJ = ../areacode/areacode.o
|
|
+
|
|
# ------------------------------------------------------------------------------
|
|
#
|
|
|
|
all: xestic
|
|
|
|
-xestic: $(LIB) $(OBJS)
|
|
- $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
|
|
+xestic: $(LIB) $(OBJS) $(ACOBJ)
|
|
+ $(CXX) -o xestic $(OBJS) $(ACOBJ) $(LIB) $(LDFLAGS) -ltermcap -lX11
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
@@ -90,7 +89,7 @@
|
|
|
|
depend dep:
|
|
@echo "Creating dependency information"
|
|
- $(CC) -I$(INCDIR) -DFREEBSD -MM *.cc > .depend
|
|
+ $(CXX) -I$(INCDIR) -DFREEBSD -MM *.cc > .depend
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Create a ZIP file
|