--- Frodo4/Src/Makefile.in	2003/07/01 18:06:06	1.4
+++ Frodo4/Src/Makefile.in	2003/07/01 19:14:08	1.6
@@ -1,24 +1,28 @@
 # Makefile.in for Frodo (generic Unix/X11)
 
 ## Version information
-VERSION   = 4
-REVISION  = 2
+VERSION  = 4
+REVISION = 2
 
+## System specific configuration
 @SET_MAKE@
-CXX    = @CXX@
-LIBS   = @LIBS@
-CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
+SHELL = /bin/sh
 
-INSTALL         = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA    = @INSTALL_DATA@
-prefix          = @prefix@
-exec_prefix     = @exec_prefix@
-bindir          = @bindir@
-libdir          = @libdir@
-sysconfdir      = @sysconfdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+datadir = @datadir@
 
-.SUFFIXES: .o .cpp .h
+DESTDIR =
+
+CXX = @CXX@
+CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@
+DEFS = @DEFS@ -DDATADIR=\"$(datadir)/frodo/\" -DBINDIR=\"$(bindir)/\"
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 
 ## Files
 OBJS    = main.o Display.o Prefs.o SID.o REU.o IEC.o 1541fs.o \
@@ -34,20 +38,50 @@ SRCS    = main.cpp Display.cpp Prefs.cpp
           VIC.cpp VIC_SC.cpp CIA.cpp CIA_SC.cpp CPU1541.cpp CPU1541_PC.cpp \
           CPU1541_SC.cpp CPU_common.cpp
 
+## Rules
+.PHONY: install installdirs uninstall clean distclean depend dep
+.SUFFIXES:
+.SUFFIXES: .o .cpp .h
+
 all: Frodo FrodoPC FrodoSC
 
 Frodo: $(SLOBJS)
-	$(CXX) -o Frodo $(SLOBJS) $(LDFLAGS) $(LIBS)
+	$(CXX) -o Frodo $(LDFLAGS) $(SLOBJS) $(LIBS)
 
 FrodoPC: $(PCOBJS)
-	$(CXX) -o FrodoPC $(PCOBJS) $(LDFLAGS) $(LIBS)
+	$(CXX) -o FrodoPC $(LDFLAGS) $(PCOBJS) $(LIBS)
 
 FrodoSC: $(SCOBJS)
-	$(CXX) -o FrodoSC $(SCOBJS) $(LDFLAGS) $(LIBS)
+	$(CXX) -o FrodoSC $(LDFLAGS) $(SCOBJS) $(LIBS)
+
+install: Frodo FrodoPC FrodoSC installdirs
+	$(INSTALL_PROGRAM) Frodo $(DESTDIR)$(bindir)/Frodo
+	$(INSTALL_PROGRAM) FrodoPC $(DESTDIR)$(bindir)/FrodoPC
+	$(INSTALL_PROGRAM) FrodoSC $(DESTDIR)$(bindir)/FrodoSC
+	$(INSTALL_PROGRAM) Frodo_GUI.tcl $(DESTDIR)$(bindir)/Frodo_GUI.tcl
+	$(INSTALL_DATA) ../1541\ ROM $(DESTDIR)$(datadir)/frodo/1541\ ROM
+	$(INSTALL_DATA) ../Basic\ ROM $(DESTDIR)$(datadir)/frodo/Basic\ ROM
+	$(INSTALL_DATA) ../Char\ ROM $(DESTDIR)$(datadir)/frodo/Char\ ROM
+	$(INSTALL_DATA) ../Kernal\ ROM $(DESTDIR)$(datadir)/frodo/Kernal\ ROM
+
+installdirs:
+	$(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/frodo
+
+uninstall:
+	rm -f $(DESTDIR)$(bindir)/Frodo
+	rm -f $(DESTDIR)$(bindir)/FrodoPC
+	rm -f $(DESTDIR)$(bindir)/FrodoSC
+	rm -f $(DESTDIR)$(bindir)/Frodo_GUI.tcl
+	rm -f $(DESTDIR)$(datadir)/frodo/1541\ ROM
+	rm -f $(DESTDIR)$(datadir)/frodo/Basic\ ROM
+	rm -f $(DESTDIR)$(datadir)/frodo/Char\ ROM
+	rm -f $(DESTDIR)$(datadir)/frodo/Kernal\ ROM
+	rmdir $(DESTDIR)$(datadir)/frodo
 
 clean:
 	rm -f $(SLOBJS) $(PCOBJS) $(SCOBJS)
 	rm -f Frodo FrodoPC FrodoSC
+	rm -f core* *.core *~ *.bak
 
 distclean: clean
 	rm -rf autom4te.cache
@@ -58,34 +92,31 @@ depend dep:
 	makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
 
 .cpp.o:
-	$(CC) $(INCLUDES) $(CFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) -o $@ -c $*.cpp
        
-.cpp.s:
-	$(CC) $(INCLUDES) $(CFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0
-
 C64_PC.o: C64.cpp C64.h C64_x.h CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
 
 CPUC64_PC.o: CPUC64.cpp CPUC64.h CPU_emulline.h C64.h VIC.h SID.h CIA.h REU.h IEC.h Display.h Version.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
 
 CPU1541_PC.o: CPU1541.cpp CPU1541.h CPU_emulline.h 1541job.h C64.h CIA.h Display.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp
 
 C64_SC.o: C64_SC.cpp C64.h C64_x.h CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
 
 CPUC64_SC.o: CPUC64_SC.cpp CPUC64.h CPU_emulcycle.h CPU_common.h C64.h VIC.h SID.h CIA.h REU.h IEC.h Display.h Version.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
 
 CPU1541_SC.o: CPU1541_SC.cpp CPU1541.h CPU_emulcycle.h CPU_common.h 1541job.h C64.h CIA.h Display.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
 
 VIC_SC.o: VIC_SC.cpp VIC.h C64.h CPUC64.h Display.h Prefs.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
 
 CIA_SC.o: CIA_SC.cpp CIA.h CPUC64.h CPU1541.h VIC.h Prefs.h
-	$(CC) $(INCLUDES) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
+	$(CXX) $(DEFS) $(CFLAGS) $(SCFLAGS) -o $@ -c $*.cpp
 
 #-------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.