Unbreak on current by using ${CXX} to compile instead of ${CC},

and #include <string.h> to get strcmp() prototype
This commit is contained in:
Kris Kennaway 2002-06-04 03:00:57 +00:00
parent de399748be
commit d53c696955
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=60567
2 changed files with 28 additions and 8 deletions

View file

@ -1,6 +1,6 @@
--- Makefile.orig Sun Nov 28 20:08:56 1999 --- Makefile.orig Sat Aug 25 11:09:00 2001
+++ Makefile Sat Nov 11 14:14:53 2000 +++ Makefile Mon Jun 3 19:55:53 2002
@@ -5,24 +5,24 @@ @@ -5,43 +5,46 @@
# very welcome). # very welcome).
# for linux # for linux
@ -33,15 +33,27 @@
all: all:
make cd-console make cd-console
@@ -38,10 +38,13 @@ strip cd-console
$(CC) -c cd_ll_linux.cpp $(CFLAGS)
cd-console: $(OBJS)
- $(CC) $(OBJS) $(LIBS) -o cd-console $(CFLAGS)
+ $(CXX) $(OBJS) $(LIBS) -o cd-console $(CFLAGS)
cd-console.o: cd.h cd-console.cpp
- $(CC) -c cd-console.cpp $(CFLAGS)
+ $(CXX) -c cd-console.cpp $(CFLAGS)
cd_ll_linux.o: cd_ll.h cd_ll_linux.h cd_ll_linux.cpp
- $(CC) -c cd_ll_linux.cpp $(CFLAGS)
+ $(CXX) -c cd_ll_linux.cpp $(CFLAGS)
cd_ll_bsd.o: cd_ll.h cd_ll_bsd.h cd_ll_bsd.cpp cd_ll_bsd.o: cd_ll.h cd_ll_bsd.h cd_ll_bsd.cpp
- $(CC) -c cd_ll_bsd.cpp $(CFLAGS) - $(CC) -c cd_ll_bsd.cpp $(CFLAGS)
+ $(CC) -c -DDEVICE=$(CDDEVICE) cd_ll_bsd.cpp $(CFLAGS) + $(CXX) -c -DDEVICE=$(CDDEVICE) cd_ll_bsd.cpp $(CFLAGS)
cd.o: cd.h cd.cpp cd.o: cd.h cd.cpp
$(CC) -c cd.cpp $(CFLAGS) - $(CC) -c cd.cpp $(CFLAGS)
+ $(CXX) -c cd.cpp $(CFLAGS)
clean: clean:
rm -f $(OBJS) cd-console rm -f $(OBJS) cd-console

View file

@ -0,0 +1,8 @@
--- cd-console.cpp.orig Mon Jun 3 19:46:12 2002
+++ cd-console.cpp Mon Jun 3 19:46:01 2002
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#ifdef OS_BSD