***************
*** 1,5 ****
- CC=	cc
- CFLAGS=	-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`
  CDEFS=	-DUNIX
  COPT=	-Ihpp -I/usr/local/include -O -pipe 
  LFLAGS= -s
--- 1,5 ----
+ CC=	g++
+ CFLAGS+=-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`
  CDEFS=	-DUNIX
  COPT=	-Ihpp -I/usr/local/include -O -pipe 
  LFLAGS= -s
***************
*** 34,53 ****
  	utils.o \
  	mask.o \
  	script.o \
- 	wildmat.o
  
- %.o: %.c
  	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
  
- %.o: $(SRCDIR)%.cpp
  	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
  
- $(SRCDIR)cfg.cpp: $(SRCDIR)cfg.y
- 	bison -l -d $< -o $(SRCDIR)cfg.tab
- 	mv $(SRCDIR)cfg.tab $(SRCDIR)cfg.cpp
  
  # Thunderbirds are go!
  
  
  ftrack: $(OBJS)
  
--- 33,82 ----
  	utils.o \
  	mask.o \
  	script.o \
+ 	wildmat.o \
+ 	ustr.o \
+ 	ficl.o \
+ 	words.o \
+ 	dict.o \
+ 	sysdep.o \
+ 	math64.o \
+ 	vm.o \
+ 	stack.o \
+ 	softcore.o
  
+ ficl.o: $(SRCDIR)ficl.c
  	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
  
+ words.o: $(SRCDIR)words.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ dict.o: $(SRCDIR)dict.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ sysdep.o: $(SRCDIR)sysdep.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ math64.o: $(SRCDIR)math64.c
  	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
  
+ vm.o: $(SRCDIR)vm.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ stack.o: $(SRCDIR)stack.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ softcore.o: $(SRCDIR)softcore.c
+ 	$(CC) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ %.o: $(SRCDIR)%.cpp
+ 	$(CXX) $(CFLAGS) $(CDEFS) $(COPT) -c $<
+ 
+ #$(SRCDIR)cfg.cpp: $(SRCDIR)cfg.y
+ #	bison -l -d $< -o $(SRCDIR)cfg.tab
+ #	mv $(SRCDIR)cfg.tab $(SRCDIR)cfg.cpp
  
  # Thunderbirds are go!
  
  
  ftrack: $(OBJS)