--- Frodo4/Src/Makefile.in 2003/07/09 13:47:10 1.7 +++ Frodo4/Src/Makefile.in 2004/01/13 19:52:48 1.9 @@ -16,10 +16,10 @@ datadir = @datadir@ DESTDIR = CXX = @CXX@ -CFLAGS = @CFLAGS@ -I./ -DKBD_LANG=@KBD_LANG@ +CFLAGS = @CFLAGS@ @GLADE_CFLAGS@ -I./ -DKBD_LANG=@KBD_LANG@ DEFS = @DEFS@ -DDATADIR=\"$(datadir)/frodo/\" -DBINDIR=\"$(bindir)/\" LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @GLADE_LIBS@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -33,9 +33,8 @@ SCOBJS = $(OBJS) C64_SC.o CPUC64_SC.o V SCFLAGS = -DFRODO_SC SRCS = main.cpp Display.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp \ 1541d64.cpp 1541t64.cpp 1541job.cpp SAM.cpp CmdPipe.cpp C64.cpp \ - C64_PC.cpp C64_SC.cpp CPUC64.cpp CPUC64_PC.cpp CPUC64_SC.cpp \ - VIC.cpp VIC_SC.cpp CIA.cpp CIA_SC.cpp CPU1541.cpp CPU1541_PC.cpp \ - CPU1541_SC.cpp CPU_common.cpp + C64_SC.cpp CPUC64.cpp CPUC64_SC.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 @@ -55,6 +54,7 @@ install: Frodo FrodoSC installdirs $(INSTALL_PROGRAM) FrodoSC $(DESTDIR)$(bindir)/FrodoSC $(INSTALL_PROGRAM) Frodo_GUI.tcl $(DESTDIR)$(bindir)/Frodo_GUI.tcl $(INSTALL_DATA) ../Kernal\ ROM $(DESTDIR)$(datadir)/frodo/Kernal\ ROM + $(INSTALL_DATA) glade/Frodo.glade $(DESTDIR)$(datadir)/frodo/Frodo.glade installdirs: $(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/frodo