$NetBSD: patch-az,v 1.1 2001/05/10 23:35:28 jtb Exp $

--- sd/bv/Makefile.orig	Wed Dec 20 13:33:13 2000
+++ sd/bv/Makefile
@@ -50,46 +50,35 @@
 BVOBJECTS = $(STOBJECTS) $(PSOBJECTS) $(RPOBJECTS) $(ATOBJECTS)
  
 tcmbv:  $(BVOBJECTS) tcmbv.o
-	$(PURIFY) $(CC) $(CFLAGS) $(BVOBJECTS) \
-	-ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
+	$(CXX) $(CXXFLAGS) $(BVOBJECTS) \
+	-ltcmdiagram -ltcmeditor -ltcmguix -ltcmglobal \
 	tcmbv.o -o $@ $(LDFLAGS) $(LDLIBS)
-	chmod a+rx $@
-	$(STRIP) $@
-	$(MV) $@ $(BIN_DIR)
+	$(MV) -f $@ $(BIN_DIR)
 
 libtcmbv.a: $(BVOBJECTS)
-	$(AR) $@ $(BVOBJECTS)
-	chmod a+rx $@
+	$(AR) cr $@ $(BVOBJECTS)
 	$(RANLIB) $@
-	$(MV) $@ $(LIB_DIR)
+	$(MV) -f $@ $(LIB_DIR)
 
 tpsd:   $(PSOBJECTS) pseditor.o
-	$(PURIFY) $(CC) $(CFLAGS) $(PSOBJECTS) pseditor.o -o $@ \
-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
-	chmod a+rx $@
-	$(STRIP) $@
-	$(MV) $@ $(BIN_DIR)
+	$(CXX) $(CXXFLAGS) $(PSOBJECTS) pseditor.o -o $@ \
+	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
+	$(MV) -f $@ $(BIN_DIR)
 
 tstd:   $(STOBJECTS) steditor.o
-	$(PURIFY) $(CC) $(CFLAGS) $(STOBJECTS) steditor.o -o $@ \
-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
-	chmod a+rx $@
-	$(STRIP) $@
-	$(MV) $@ $(BIN_DIR)
+	$(CXX) $(CXXFLAGS) $(STOBJECTS) steditor.o -o $@ \
+	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
+	$(MV) -f $@ $(BIN_DIR)
 
 trpg:   $(RPOBJECTS) rpeditor.o
-	$(PURIFY) $(CC) $(CFLAGS) $(RPOBJECTS) rpeditor.o -o $@ \
-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
-	chmod a+rx $@
-	$(STRIP) $@
-	$(MV) $@ $(BIN_DIR)
+	$(CXX) $(CXXFLAGS) $(RPOBJECTS) rpeditor.o -o $@ \
+	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
+	$(MV) -f $@ $(BIN_DIR)
 
 tatd:   $(ATOBJECTS) ateditor.o
-	$(PURIFY) $(CC) $(CFLAGS) $(ATOBJECTS) ateditor.o -o $@ \
-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
-	chmod a+rx $@
-	$(STRIP) $@
-	$(MV) $@ $(BIN_DIR)
+	$(CXX) $(CXXFLAGS) $(ATOBJECTS) ateditor.o -o $@ \
+	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
+	$(MV) -f $@ $(BIN_DIR)
 
 
 clean: xclean