*** Makefile.orig	Thu Oct  1 11:39:18 1998
--- Makefile	Wed Jan  5 06:38:01 2000
***************
*** 12,50 ****
  
  # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
  # unless there's more than one ncurses floating around on your system
! LIBNC	= -L/usr/local/lib -lncurses
  
  ######### NOTE:  X11R6 or newer REQUIRED
! LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
! LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
! LIBVGA	= -L/usr/local/lib -lvgagl -lvga
  
  # ncurses is usually in /usr/include/ncurses, but you may need
  # to use /usr/local/include/ncurses depending on your setup.
! INCNC	= -I/usr/include/ncurses
  
  # just in case you keep your X includes in an odd location.
! INCX11	= -I/usr/X11R6/include -DNARROWPROTO
  
  # stuff for sound blaster awe32
  INCAWE  = -DVOXWARE_CONTROLLER_7_WORKING
  # awe_voice.h path
! INCAWE  += -I/usr/lib/oss/include/sys
  
  # usually in /usr/include, but -I/usr/local/include doesn't hurt
  # unless there's more than one svgalib floating around your system.
! INCVGA	= -I/usr/local/include
  
  # Directory where application defaults files are stored for X11 version
! XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
  
  INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
! INSTALLDIR = /usr/bin
! INSTALL = install -s
  
  # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
! CFLAGS	= -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
! LDFLAGS =
  
  OBJECTS = playmidi.o readmidi.o playevents.o \
  	  patchload.o emumidi.o io_ncurses.o
--- 12,53 ----
  
  # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
  # unless there's more than one ncurses floating around on your system
! LIBNC	= -lncurses -lmytinfo
  
  ######### NOTE:  X11R6 or newer REQUIRED
! #LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
! #LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
! #LIBVGA	= -L/usr/local/lib -lvgagl -lvga
  
  # ncurses is usually in /usr/include/ncurses, but you may need
  # to use /usr/local/include/ncurses depending on your setup.
! #INCNC	= -I/usr/include/ncurses
  
  # just in case you keep your X includes in an odd location.
! #INCX11	= -I/usr/X11R6/include -DNARROWPROTO
  
  # stuff for sound blaster awe32
  INCAWE  = -DVOXWARE_CONTROLLER_7_WORKING
  # awe_voice.h path
! INCAWE  += -I.
  
  # usually in /usr/include, but -I/usr/local/include doesn't hurt
  # unless there's more than one svgalib floating around your system.
! #INCVGA	= -I/usr/local/include
  
  # Directory where application defaults files are stored for X11 version
! #XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
  
  INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
! INSTALLDIR = ${PREFIX}/bin
! LIBDATADIR = ${PREFIX}/libdata/midi
! #INSTALL = install -s
  
  # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
! CFLAGS	+= -DPREFIX=\"$(PREFIX)\" $(INCAWE)
! #LDFLAGS =
! INSTALL_BIN = ${BSD_INSTALL_PROGRAM}
! INSTALL_DAT = ${BSD_INSTALL_DATA}
  
  OBJECTS = playmidi.o readmidi.o playevents.o \
  	  patchload.o emumidi.o io_ncurses.o
***************
*** 58,64 ****
  GOBJECTS= playmidi.o readmidi.o playevents.o \
  	  patchload.o emumidi.o io_gtk.o
  
! all: playmidi xplaymidi 
  
  config:
  playmidi.h: playmidi.h-dist
--- 61,67 ----
  GOBJECTS= playmidi.o readmidi.o playevents.o \
  	  patchload.o emumidi.o io_gtk.o
  
! all: playmidi #xplaymidi 
  
  config:
  playmidi.h: playmidi.h-dist
***************
*** 73,136 ****
  io_svgalib.o: io_svgalib.c
  	$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
  
! playmidi: .depend $(OBJECTS)
  	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
  
! xplaymidi: .depend $(XOBJECTS)
  	$(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
  
! gtkplaymidi: .depend $(GOBJECTS)
  	$(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
  
! splaymidi: .depend $(SOBJECTS)
  	$(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
  
  $(INSTALLDIR)/playmidi: playmidi
! 	$(INSTALL) playmidi $(INSTALLDIR)
  
  $(INSTALLDIR)/xplaymidi: xplaymidi
! 	$(INSTALL) xplaymidi $(INSTALLDIR)
  
  $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
! 	$(INSTALL) gtkplaymidi $(INSTALLDIR)
  
  $(INSTALLDIR)/splaymidi: splaymidi
! 	$(INSTALL) splaymidi $(INSTALLDIR)
  
! /etc/std.o3:
! 	cp -i std.o3 /etc
  
! /etc/drums.o3:
! 	cp -i drums.o3 /etc
  
! /etc/std.sb:
! 	cp -i std.sb /etc
! 
! /etc/drums.sb:
! 	cp -i drums.sb /etc
  
  $(XAPPDEFAULTS)/XPlaymidi:
! 	cp -i XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
! 
! install: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
! 	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
! 	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
! 
! install.novga: $(INSTALLDIR)/playmidi \
! 	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
! 	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
  
! install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
! 	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
! 
! install.Xonly: $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
! 	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
! 
! install.lame: $(INSTALLDIR)/playmidi \
! 	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
  
  install.man:
! 	 cp playmidi.1 /usr/man/man1/
  
  clean:
  	rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
--- 76,146 ----
  io_svgalib.o: io_svgalib.c
  	$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
  
! playmidi: $(OBJECTS)
  	$(CC) $(LDFLAGS) -o playmidi $(OBJECTS) $(LIBNC)
  
! xplaymidi: $(XOBJECTS)
  	$(CC) $(LDFLAGS) -o xplaymidi $(XOBJECTS) $(LIBX11)
  
! gtkplaymidi: $(GOBJECTS)
  	$(CC) $(LDFLAGS) -o gtkplaymidi $(GOBJECTS) $(LIBGTK)
  
! splaymidi: $(SOBJECTS)
  	$(CC) $(LDFLAGS) -o splaymidi $(SOBJECTS) $(LIBVGA)
  
  $(INSTALLDIR)/playmidi: playmidi
! 	$(INSTALL_BIN) playmidi $(INSTALLDIR)
  
  $(INSTALLDIR)/xplaymidi: xplaymidi
! 	$(INSTALL_BIN) xplaymidi $(INSTALLDIR)
  
  $(INSTALLDIR)/gtkplaymidi: gtkplaymidi
! 	$(INSTALL_BIN) gtkplaymidi $(INSTALLDIR)
  
  $(INSTALLDIR)/splaymidi: splaymidi
! 	$(INSTALL_BIN) splaymidi $(INSTALLDIR)
  
! $(LIBDATADIR)/std.o3:
! 	$(INSTALL_DAT) std.o3 $(LIBDATADIR)       
!   
! $(LIBDATADIR)/drums.o3:
! 	$(INSTALL_DAT) drums.o3 $(LIBDATADIR)
  
! $(LIBDATADIR)/std.sb:
! 	$(INSTALL_DAT) std.sb $(LIBDATADIR)       
  
! $(LIBDATADIR)/drums.sb:
! 	$(INSTALL_DAT) drums.sb $(LIBDATADIR)
  
  $(XAPPDEFAULTS)/XPlaymidi:
! 	$(INSTALL_DAT) XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
  
! dirs:
! 	-@mkdir -p $(LIBDATADIR)
! 	-@mkdir -p ${PREFIX}/lib/Plib
! 
! install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
! 	 $(INSTALLDIR)/xplaymidi $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
! 	 $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
! 
! install.novga: dirs $(INSTALLDIR)/playmidi \
! 	 $(INSTALLDIR)/xplaymidi $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
! 	 $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
! 
! install.noX11: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
! 	 $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
! 	 $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb
! 
! install.Xonly: dirs $(INSTALLDIR)/xplaymidi \
! 	 $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
! 	 $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
! 
! install.lame: dirs $(INSTALLDIR)/playmidi \
! 	 $(LIBDATADIR)/std.o3 $(LIBDATADIR)/drums.o3 \
! 	 $(LIBDATADIR)/std.sb $(LIBDATADIR)/drums.sb
  
  install.man:
! 	 ${BSD_INSTALL_MAN} playmidi.1 ${PREFIX}/man/man1/
  
  clean:
  	rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
***************
*** 138,159 ****
  distclean: clean
  	rm -f .depend  *~ *.bak playmidi.h config.sed
  
- 
- ifeq (.depend, $(wildcard .depend))
- .depend depend dep: playmidi.h
- 	for i in *.c; do $(CPP) -M $(CFLAGS) $(INCLUDES) $$i; done >.depend
- 
- include .depend
- else
- depend dep:
- 	for i in *.c; do $(CPP) -M $(CFLAGS) $(INCLUDES) $$i; done >.depend
- 
- .depend: playmidi.h
- 	@echo
- 	@echo "Bad or missing .depend running 'make depend clean'"
- 	@echo
- 	$(MAKE) depend clean
- 	@echo
- 	@echo "Successful.  Trying to make again"
- 	@exit 0
- endif
--- 148,150 ----