--- baycomepp-0.10.orig/Makefile.in
+++ baycomepp-0.10/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -127,14 +127,14 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -252,7 +252,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -301,6 +301,11 @@
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
--- baycomepp-0.10.orig/directx/Makefile.in
+++ baycomepp-0.10/directx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -110,17 +110,15 @@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 
-INCLUDES = -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6
+INCLUDES = -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" 	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6
 
 
-@DIRECTX_TRUE@BUILT_SOURCES = @DIRECTX_TRUE@libddraw.a libdsound.a libdinput.a libdplayx.a
+@DIRECTX_TRUE@BUILT_SOURCES = libddraw.a libdsound.a libdinput.a libdplayx.a
 
-@DIRECTX_TRUE@noinst_LIBRARIES = @DIRECTX_TRUE@libdinput1.a
-@DIRECTX_TRUE@libdinput1_a_SOURCES = @DIRECTX_TRUE@dinput.c
+@DIRECTX_TRUE@noinst_LIBRARIES = libdinput1.a
+@DIRECTX_TRUE@libdinput1_a_SOURCES = dinput.c
 
-EXTRA_DIST = libddraw.def libdinput.def libdplayx.def libdsound.def dinput.c \
-	fixdirectx.sh deunion.pl include/directx.h include/mmsystem.h
+EXTRA_DIST = libddraw.def libdinput.def libdplayx.def libdsound.def dinput.c 	fixdirectx.sh deunion.pl include/directx.h include/mmsystem.h
 
 
 CLEANFILES = libddraw.a libdinput.a libdplayx.a libdsound.a
@@ -145,8 +143,9 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/dinput.P
 SOURCES = $(libdinput1_a_SOURCES)
 OBJECTS = $(libdinput1_a_OBJECTS)
 
@@ -154,9 +153,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps directx/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu directx/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -170,9 +169,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -218,7 +214,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -234,6 +230,11 @@
 subdir = directx
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu directx/Makefile
 	$(mkinstalldirs) $(distdir)/include
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
@@ -246,6 +247,37 @@
 	  fi; \
 	done
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -284,23 +316,25 @@
 maintainer-clean-generic:
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -310,12 +344,13 @@
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 libddraw.a libdsound.a libdplayx.a: libddraw.def libdsound.def libdplayx.def
--- baycomepp-0.10.orig/main/Makefile.in
+++ baycomepp-0.10/main/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -110,43 +110,28 @@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 
-INCLUDES = -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6 \
-	-I$(top_srcdir)/
+INCLUDES = -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" 	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6 	-I$(top_srcdir) -fPIC
 
-@PPUSER_TRUE@PPSRC1 = @PPUSER_TRUE@ppuser.c ppuserinit.c ppdev.c ppdevinit.c
+@PPUSER_TRUE@PPSRC1 = ppuser.c ppuserinit.c ppdev.c ppdevinit.c
 @PPUSER_FALSE@PPSRC1 = 
-@PPKDRV_TRUE@PPSRC2 = @PPKDRV_TRUE@ppkdrv.c ppkdrvinit.c
+@PPKDRV_TRUE@PPSRC2 = ppkdrv.c ppkdrvinit.c
 @PPKDRV_FALSE@PPSRC2 = 
-@WIN32_TRUE@PPSRC3 = @WIN32_TRUE@ppwin.c ppwininit.c ppntddkgenport.c ppntddkgenportinit.c ppw9xring0.c ppw9xring0init.c
+@WIN32_TRUE@PPSRC3 = ppwin.c ppwininit.c ppntddkgenport.c ppntddkgenportinit.c ppw9xring0.c ppw9xring0init.c
 @WIN32_FALSE@PPSRC3 = 
-@DIRECTX_TRUE@DIRECTXLIBS = @DIRECTX_TRUE@-L$(top_builddir)/directx -ldsound -luser32 -lgdi32
+@DIRECTX_TRUE@DIRECTXLIBS = -L$(top_builddir)/directx -ldsound -luser32 -lgdi32
 @DIRECTX_FALSE@DIRECTXLIBS = 
 
 noinst_LIBRARIES = libinit.a libresident.a libresident2.a libmisc.a
 
 man_MANS = eppfpga.8
 
-libresident_a_SOURCES = \
-	ppdirect.c \
-	snprintpkt.c
-
-
-libresident2_a_SOURCES = \
-	$(PPSRC1) $(PPSRC2) $(PPSRC3)
-
-
-libinit_a_SOURCES = \
-	fpgatests.c \
-	configfpga.c \
-	ppdirectinit.c \
-	ecp_firmware.h \
-	epp_firmware.h \
-	eppafsk_firmware.h \
-	eppchk_firmware.h \
-	eppsamp_firmware.h \
-	sppafsk_firmware.h \
-	epp_fpga.h
+libresident_a_SOURCES =  	ppdirect.c 	snprintpkt.c
+
+
+libresident2_a_SOURCES =  	$(PPSRC1) $(PPSRC2) $(PPSRC3)
+
+
+libinit_a_SOURCES =  	fpgatests.c 	configfpga.c 	ppdirectinit.c 	ecp_firmware.h 	epp_firmware.h 	eppafsk_firmware.h 	eppchk_firmware.h 	eppsamp_firmware.h 	sppafsk_firmware.h 	epp_fpga.h
 
 
 libmisc_a_SOURCES = 
@@ -154,29 +139,16 @@
 
 sbin_PROGRAMS = eppfpga
 
-eppfpga_SOURCES = \
-	eppfpga.c
+eppfpga_SOURCES =  	eppfpga.c
 
 
-eppfpga_LDADD = \
-	libinit.a libresident.a libresident2.a libmisc.a $(DIRECTXLIBS)
+eppfpga_LDADD =  	libinit.a libresident.a libresident2.a libmisc.a $(DIRECTXLIBS)
 
 
-noinst_HEADERS = \
-	fpga.h     \
-	sysdeps.h  \
-	util.h     \
-	parport.h  \
-	getopt.h   \
-	ppdev.h    \
-	ppuser.h
+noinst_HEADERS =  	fpga.h     	sysdeps.h  	util.h     	parport.h  	getopt.h   	ppdev.h    	ppuser.h
 
 
-EXTRA_DIST = getopt.c getopt1.c syslog.c vsnprintf.c \
-	eppfpga.8 openpty.c \
-	ppuser.c ppuserinit.c ppdev.c ppdevinit.c ppkdrv.c ppkdrvinit.c \
-	ppntddkgenport.c ppntddkgenportinit.c ppnt.c ppntinit.c \
-	ppw9xring0.c ppw9xring0init.c ppwin.c ppwininit.c
+EXTRA_DIST = getopt.c getopt1.c syslog.c vsnprintf.c 	eppfpga.8 openpty.c 	ppuser.c ppuserinit.c ppdev.c ppdevinit.c ppkdrv.c ppkdrvinit.c 	ppntddkgenport.c ppntddkgenportinit.c ppnt.c ppntinit.c 	ppw9xring0.c ppw9xring0init.c ppwin.c ppwininit.c
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -194,26 +166,6 @@
 libresident_a_LIBADD = 
 libresident_a_OBJECTS =  ppdirect.$(OBJEXT) snprintpkt.$(OBJEXT)
 libresident2_a_LIBADD = 
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@libresident2_a_OBJECTS =  \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppkdrv.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppkdrvinit.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppwin.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppwininit.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppntddkgenport.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppntddkgenportinit.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppw9xring0.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppw9xring0init.$(OBJEXT)
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@libresident2_a_OBJECTS =  \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppuser.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppuserinit.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppdev.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppdevinit.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppkdrv.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppkdrvinit.$(OBJEXT)
-@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_FALSE@libresident2_a_OBJECTS = 
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_FALSE@libresident2_a_OBJECTS =  \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_FALSE@ppkdrv.$(OBJEXT) \
-@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_FALSE@ppkdrvinit.$(OBJEXT)
 @PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_TRUE@libresident2_a_OBJECTS =  \
 @PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_TRUE@ppuser.$(OBJEXT) \
 @PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_TRUE@ppuserinit.$(OBJEXT) \
@@ -227,6 +179,15 @@
 @PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_TRUE@ppntddkgenportinit.$(OBJEXT) \
 @PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_TRUE@ppw9xring0.$(OBJEXT) \
 @PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_TRUE@ppw9xring0init.$(OBJEXT)
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@libresident2_a_OBJECTS =  \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppkdrv.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppkdrvinit.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppwin.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppwininit.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppntddkgenport.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppntddkgenportinit.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppw9xring0.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_TRUE@@PPUSER_FALSE@ppw9xring0init.$(OBJEXT)
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_TRUE@libresident2_a_OBJECTS =  \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_TRUE@ppuser.$(OBJEXT) \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_TRUE@ppuserinit.$(OBJEXT) \
@@ -238,6 +199,12 @@
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_TRUE@ppntddkgenportinit.$(OBJEXT) \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_TRUE@ppw9xring0.$(OBJEXT) \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_TRUE@ppw9xring0init.$(OBJEXT)
+@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@libresident2_a_OBJECTS =  \
+@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppuser.$(OBJEXT) \
+@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppuserinit.$(OBJEXT) \
+@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppdev.$(OBJEXT) \
+@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppdevinit.$(OBJEXT)
+@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_FALSE@libresident2_a_OBJECTS = 
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_FALSE@libresident2_a_OBJECTS =  \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_FALSE@ppwin.$(OBJEXT) \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_FALSE@ppwininit.$(OBJEXT) \
@@ -245,21 +212,26 @@
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_FALSE@ppntddkgenportinit.$(OBJEXT) \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_FALSE@ppw9xring0.$(OBJEXT) \
 @PPKDRV_FALSE@@WIN32_TRUE@@PPUSER_FALSE@ppw9xring0init.$(OBJEXT)
-@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@libresident2_a_OBJECTS =  \
-@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppuser.$(OBJEXT) \
-@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppuserinit.$(OBJEXT) \
-@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppdev.$(OBJEXT) \
-@PPKDRV_FALSE@@WIN32_FALSE@@PPUSER_TRUE@ppdevinit.$(OBJEXT)
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_FALSE@libresident2_a_OBJECTS =  \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_FALSE@ppkdrv.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_FALSE@ppkdrvinit.$(OBJEXT)
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@libresident2_a_OBJECTS =  \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppuser.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppuserinit.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppdev.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppdevinit.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppkdrv.$(OBJEXT) \
+@PPKDRV_TRUE@@WIN32_FALSE@@PPUSER_TRUE@ppkdrvinit.$(OBJEXT)
 libmisc_a_DEPENDENCIES =  @LIBOBJS@
 libmisc_a_OBJECTS = 
 sbin_PROGRAMS =  eppfpga$(EXEEXT)
 PROGRAMS =  $(sbin_PROGRAMS)
 
 eppfpga_OBJECTS =  eppfpga.$(OBJEXT)
-@DIRECTX_TRUE@eppfpga_DEPENDENCIES =  libinit.a libresident.a \
-@DIRECTX_TRUE@libresident2.a libmisc.a
 @DIRECTX_FALSE@eppfpga_DEPENDENCIES =  libinit.a libresident.a \
 @DIRECTX_FALSE@libresident2.a libmisc.a
+@DIRECTX_TRUE@eppfpga_DEPENDENCIES =  libinit.a libresident.a \
+@DIRECTX_TRUE@libresident2.a libmisc.a
 eppfpga_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -276,8 +248,14 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/configfpga.P .deps/eppfpga.P .deps/fpgatests.P \
+.deps/getopt.P .deps/getopt1.P .deps/ppdev.P .deps/ppdevinit.P \
+.deps/ppdirect.P .deps/ppdirectinit.P .deps/ppkdrv.P .deps/ppkdrvinit.P \
+.deps/ppntddkgenport.P .deps/ppntddkgenportinit.P .deps/ppuser.P \
+.deps/ppuserinit.P .deps/ppw9xring0.P .deps/ppw9xring0init.P \
+.deps/ppwin.P .deps/ppwininit.P .deps/snprintpkt.P .deps/vsnprintf.P
 SOURCES = $(libinit_a_SOURCES) $(libresident_a_SOURCES) $(libresident2_a_SOURCES) $(libmisc_a_SOURCES) $(eppfpga_SOURCES)
 OBJECTS = $(libinit_a_OBJECTS) $(libresident_a_OBJECTS) $(libresident2_a_OBJECTS) $(libmisc_a_OBJECTS) $(eppfpga_OBJECTS)
 
@@ -285,9 +263,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps main/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu main/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -301,9 +279,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -432,7 +407,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -448,6 +423,11 @@
 subdir = main
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu main/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -458,19 +438,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-configfpga.o: configfpga.c ../config.h getopt.h parport.h sysdeps.h \
-	fpga.h util.h epp_fpga.h epp_firmware.h eppchk_firmware.h \
-	ecp_firmware.h eppafsk_firmware.h eppsamp_firmware.h \
-	sppafsk_firmware.h
-eppfpga.o: eppfpga.c ../config.h getopt.h parport.h sysdeps.h fpga.h
-fpgatests.o: fpgatests.c ../config.h getopt.h parport.h sysdeps.h fpga.h \
-	util.h epp_fpga.h
-ppdirect.o: ppdirect.c parport.h ../config.h sysdeps.h getopt.h fpga.h
-ppdirectinit.o: ppdirectinit.c parport.h ../config.h sysdeps.h getopt.h \
-	fpga.h
-snprintpkt.o: snprintpkt.c ../config.h fpga.h sysdeps.h getopt.h \
-	parport.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -509,25 +508,25 @@
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-sbinPROGRAMS mostlyclean-tags \
-		mostlyclean-generic
+		mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLIBRARIES clean-compile clean-sbinPROGRAMS \
-		clean-tags clean-generic mostlyclean-am
+		clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-sbinPROGRAMS distclean-tags distclean-generic \
-		clean-am
+		distclean-sbinPROGRAMS distclean-tags distclean-depend \
+		distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-sbinPROGRAMS \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -540,12 +539,13 @@
 distclean-sbinPROGRAMS clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS \
 uninstall-sbinPROGRAMS install-sbinPROGRAMS install-man8 uninstall-man8 \
 install-man uninstall-man tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- baycomepp-0.10.orig/main/Makefile.am
+++ baycomepp-0.10/main/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6 \
-	-I$(top_srcdir)/
+	-I$(top_srcdir) -fPIC
 
 if PPUSER
 PPSRC1 = ppuser.c ppuserinit.c ppdev.c ppdevinit.c
--- baycomepp-0.10.orig/main/fpgatests.c
+++ baycomepp-0.10/main/fpgatests.c
@@ -1964,16 +1964,16 @@
 }
 
 #define DECODEITERA(j)                                                        \
-({                                                                            \
+{                                                                             \
         if (!(notbitstream & (0x0fc << j)))              /* flag or abort */  \
                 goto flgabrt##j;                                              \
         if ((bitstream & (0x1f8 << j)) == (0xf8 << j))   /* stuffed bit */    \
                 goto stuff##j;                                                \
-  enditer##j:                                                                 \
-})
+}                                                                             \
+  enditer##j:
 
 #define DECODEITERB(j)                                                                 \
-({                                                                                     \
+{                                                                                      \
   flgabrt##j:                                                                          \
         if (!(notbitstream & (0x1fc << j))) {              /* abort received */        \
                 state = 0;                                                             \
@@ -1992,7 +1992,7 @@
         numbits--;                                                                     \
         bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 1);        \
         goto enditer##j;                                                               \
-})
+}
         
 /* ---------------------------------------------------------------------- */
 
--- baycomepp-0.10.orig/main/sysdeps.h
+++ baycomepp-0.10/main/sysdeps.h
@@ -140,6 +140,21 @@
 
 #endif /* !HAVE_IOFUNCS */
 
+#ifdef __alpha__
+extern inline void insb(unsigned short port, unsigned char *addr, unsigned long count)
+{
+	int i;
+	for (i=0; i<count; i++) *(addr+i)=inb(port+i);
+}
+
+extern inline void outsb(unsigned short port, const unsigned char *addr,
+    unsigned long count)
+{
+	int i;
+	for (i=0; i<count; i++) outb(port+i, *(addr+i)); 
+}
+
+#endif
 /* ---------------------------------------------------------------------- */
 /*
  * syslog routines
--- baycomepp-0.10.orig/udriver/Makefile.in
+++ baycomepp-0.10/udriver/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -111,10 +111,10 @@
 WINDRES = @WINDRES@
 
 INCLUDES = -I$(top_srcdir)/main -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -fPIC -DPIC
-@BAYCOMDRV_TRUE@DRVPROGS = @BAYCOMDRV_TRUE@baycomepp
+@BAYCOMDRV_TRUE@DRVPROGS = baycomepp
 @BAYCOMDRV_FALSE@DRVPROGS = 
-@BAYCOMDRV_TRUE@DRVEXECSCR = @BAYCOMDRV_TRUE@baycomfpga_init.so
-@BAYCOMDRV_TRUE@DRVLIBS = @BAYCOMDRV_TRUE@libdrvinit.a
+@BAYCOMDRV_TRUE@DRVEXECSCR = baycomfpga_init.so
+@BAYCOMDRV_TRUE@DRVLIBS = libdrvinit.a
 
 noinst_LIBRARIES = $(DRVLIBS)
 libexec_SCRIPTS = $(DRVEXECSCR)
@@ -123,27 +123,21 @@
 
 sbin_PROGRAMS = $(DRVPROGS)
 
-libdrvinit_a_SOURCES = \
-	drvinit.c
+libdrvinit_a_SOURCES =  	drvinit.c
 
 
-baycomepp_SOURCES = \
-	drvresident.c
+baycomepp_SOURCES =  	drvresident.c
 
 
-baycomepp_LDADD = \
-	$(top_builddir)/main/libresident.a $(top_builddir)/main/libmisc.a \
-	$(DRVLIBOBJS) -ldl
+baycomepp_LDADD =  	$(top_builddir)/main/libresident.a $(top_builddir)/main/libmisc.a 	$(DRVLIBOBJS) -ldl
 
 
-baycomepp_LDFLAGS = \
-	-rdynamic -Wl,-Map -Wl,baycomepp.map -Wl,--rpath -Wl,$(libexecdir)
+baycomepp_LDFLAGS =  	-rdynamic -Wl,-Map -Wl,baycomepp.map -Wl,--rpath -Wl,$(libexecdir)
 
 
 CLEANFILES = baycomepp.map baycomfpga_init.so
 
-noinst_HEADERS = \
-	drv.h
+noinst_HEADERS =  	drv.h
 
 
 EXTRA_DIST = baycomepp.8 baycomepp.initscript
@@ -159,8 +153,8 @@
 LIBS = @LIBS@
 libdrvinit_a_LIBADD = 
 libdrvinit_a_OBJECTS =  drvinit.$(OBJEXT)
-@BAYCOMDRV_FALSE@sbin_PROGRAMS = 
 @BAYCOMDRV_TRUE@sbin_PROGRAMS =  baycomepp$(EXEEXT)
+@BAYCOMDRV_FALSE@sbin_PROGRAMS = 
 PROGRAMS =  $(sbin_PROGRAMS)
 
 baycomepp_OBJECTS =  drvresident.$(OBJEXT)
@@ -183,8 +177,9 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/drvinit.P .deps/drvresident.P
 SOURCES = $(libdrvinit_a_SOURCES) $(baycomepp_SOURCES)
 OBJECTS = $(libdrvinit_a_OBJECTS) $(baycomepp_OBJECTS)
 
@@ -192,9 +187,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps udriver/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu udriver/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -208,9 +203,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -343,7 +335,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -359,6 +351,11 @@
 subdir = udriver
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu udriver/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -369,11 +366,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-drvinit.o: drvinit.c ../config.h ../main/getopt.h drv.h ../main/fpga.h \
-	../main/sysdeps.h ../main/parport.h
-drvresident.o: drvresident.c ../config.h ../main/getopt.h drv.h \
-	../main/fpga.h ../main/sysdeps.h ../main/parport.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -415,25 +439,25 @@
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-sbinPROGRAMS mostlyclean-tags \
-		mostlyclean-generic
+		mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLIBRARIES clean-compile clean-sbinPROGRAMS \
-		clean-tags clean-generic mostlyclean-am
+		clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-sbinPROGRAMS distclean-tags distclean-generic \
-		clean-am
+		distclean-sbinPROGRAMS distclean-tags distclean-depend \
+		distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-sbinPROGRAMS \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -447,8 +471,9 @@
 uninstall-sbinPROGRAMS install-sbinPROGRAMS uninstall-libexecSCRIPTS \
 install-libexecSCRIPTS install-man8 uninstall-man8 install-man \
 uninstall-man tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
--- baycomepp-0.10.orig/udriver/drvresident.c
+++ baycomepp-0.10/udriver/drvresident.c
@@ -210,14 +210,14 @@
  */
 
 #define ENCODEITERA(j)                         \
-({                                             \
+{                                              \
         if (!(notbitstream & (0x1f0 << j)))    \
                 goto stuff##j;                 \
-  encodeend##j:                                \
-})
+}                                              \
+  encodeend##j:
 
 #define ENCODEITERB(j)                                          \
-({                                                              \
+{                                                               \
   stuff##j:                                                     \
         bitstream &= ~(0x100 << j);                             \
         bitbuf = (bitbuf & (((2 << j) << numbit) - 1)) |        \
@@ -225,7 +225,7 @@
         numbit++;                                               \
         notbitstream = ~bitstream;                              \
         goto encodeend##j;                                      \
-})
+}
 
 static int hdlc_enqueue(u_int8_t *pkt, int len)
 {
@@ -317,16 +317,16 @@
 }
 
 #define DECODEITERA(j)                                                        \
-({                                                                            \
+{                                                                             \
         if (!(notbitstream & (0x0fc << j)))              /* flag or abort */  \
                 goto flgabrt##j;                                              \
         if ((bitstream & (0x1f8 << j)) == (0xf8 << j))   /* stuffed bit */    \
                 goto stuff##j;                                                \
-  enditer##j:                                                                 \
-})
+}                                                                             \
+  enditer##j:
 
 #define DECODEITERB(j)                                                                 \
-({                                                                                     \
+{                                                                                      \
   flgabrt##j:                                                                          \
         if (!(notbitstream & (0x1fc << j))) {              /* abort received */        \
                 stat = 0;                                                              \
@@ -345,7 +345,7 @@
         numbits--;                                                                     \
         bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 1);        \
         goto enditer##j;                                                               \
-})
+}
         
 /* --------------------------------------------------------------------- */
 
--- baycomepp-0.10.orig/eppdiag/Makefile.in
+++ baycomepp-0.10/eppdiag/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -110,39 +110,32 @@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 
-INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)/main \
-	-DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
+INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)/main 	-DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
 
-@HAVEGTK_TRUE@GTKPROGS = @HAVEGTK_TRUE@eppdiag
+@HAVEGTK_TRUE@GTKPROGS = eppdiag
 @HAVEGTK_FALSE@GTKPROGS = 
-@DIRECTX_TRUE@DIRECTXLIBS = @DIRECTX_TRUE@-L$(top_builddir)/directx -ldsound -luser32 -lgdi32
+@DIRECTX_TRUE@DIRECTXLIBS = -L$(top_builddir)/directx -ldsound -luser32 -lgdi32
 @DIRECTX_FALSE@DIRECTXLIBS = 
 
 sbin_PROGRAMS = $(GTKPROGS)
 
-eppdiag_SOURCES = \
-        gladesrc.c \
-	eppdiag.c
+eppdiag_SOURCES =          gladesrc.c 	eppdiag.c
 
 
-eppdiag_LDADD = \
-	../main/libinit.a ../main/libresident.a ../main/libresident2.a \
-	$(GTK_LIBS) ../main/libmisc.a $(DIRECTXLIBS)
+eppdiag_LDADD =  	../main/libinit.a ../main/libresident.a ../main/libresident2.a 	$(GTK_LIBS) ../main/libmisc.a $(DIRECTXLIBS)
 
 
 CLEANFILES = 
 
-noinst_HEADERS = \
-        gladesrc.h \
-        gladesig.h
+noinst_HEADERS =          gladesrc.h         gladesig.h
 
 
 EXTRA_DIST = eppdiag.glade
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-@HAVEGTK_TRUE@sbin_PROGRAMS =  eppdiag$(EXEEXT)
 @HAVEGTK_FALSE@sbin_PROGRAMS = 
+@HAVEGTK_TRUE@sbin_PROGRAMS =  eppdiag$(EXEEXT)
 PROGRAMS =  $(sbin_PROGRAMS)
 
 
@@ -151,12 +144,12 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 eppdiag_OBJECTS =  gladesrc.$(OBJEXT) eppdiag.$(OBJEXT)
-@DIRECTX_TRUE@eppdiag_DEPENDENCIES =  ../main/libinit.a \
-@DIRECTX_TRUE@../main/libresident.a ../main/libresident2.a \
-@DIRECTX_TRUE@../main/libmisc.a
 @DIRECTX_FALSE@eppdiag_DEPENDENCIES =  ../main/libinit.a \
 @DIRECTX_FALSE@../main/libresident.a ../main/libresident2.a \
 @DIRECTX_FALSE@../main/libmisc.a
+@DIRECTX_TRUE@eppdiag_DEPENDENCIES =  ../main/libinit.a \
+@DIRECTX_TRUE@../main/libresident.a ../main/libresident2.a \
+@DIRECTX_TRUE@../main/libmisc.a
 eppdiag_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -169,8 +162,9 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/eppdiag.P .deps/gladesrc.P
 SOURCES = $(eppdiag_SOURCES)
 OBJECTS = $(eppdiag_OBJECTS)
 
@@ -178,9 +172,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps eppdiag/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu eppdiag/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -210,9 +204,6 @@
 	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -257,7 +248,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -273,6 +264,11 @@
 subdir = eppdiag
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu eppdiag/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -283,11 +279,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-eppdiag.o: eppdiag.c ../config.h ../main/getopt.h ../main/fpga.h \
-	../main/sysdeps.h ../main/parport.h gladesrc.h gladesig.h
-gladesrc.o: gladesrc.c ../main/getopt.h ../config.h gladesig.h \
-	gladesrc.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -326,23 +349,24 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-sbinPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-sbinPROGRAMS clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-sbinPROGRAMS clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-sbinPROGRAMS distclean-compile distclean-tags \
-		distclean-generic clean-am
+		distclean-depend distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-sbinPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -352,12 +376,14 @@
 clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
 install-sbinPROGRAMS mostlyclean-compile distclean-compile \
 clean-compile maintainer-clean-compile tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- baycomepp-0.10.orig/eppfm/Makefile.in
+++ baycomepp-0.10/eppfm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -110,33 +110,25 @@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 
-INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)/main \
-	-DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6
+INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)/main 	-DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" 	-I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6
 
-@DIRECTX_TRUE@DIRECTXLIBS = @DIRECTX_TRUE@-L$(top_builddir)/directx -ldsound -luser32 -lgdi32
+@DIRECTX_TRUE@DIRECTXLIBS = -L$(top_builddir)/directx -ldsound -luser32 -lgdi32
 @DIRECTX_FALSE@DIRECTXLIBS = 
 
-@HAVEGTK_TRUE@bin_PROGRAMS = @HAVEGTK_TRUE@eppfm
+@HAVEGTK_TRUE@bin_PROGRAMS = eppfm
 
 EXTRA_DIST = costab.c gentbl.c
 
-@CROSSCOMP_FALSE@gentbl_SOURCES = @CROSSCOMP_FALSE@gentbl.c
+@CROSSCOMP_FALSE@gentbl_SOURCES = gentbl.c
 
-@CROSSCOMP_FALSE@BUILT_SOURCES = @CROSSCOMP_FALSE@costab.c
+@CROSSCOMP_FALSE@BUILT_SOURCES = costab.c
 
-@CROSSCOMP_FALSE@noinst_PROGRAMS = @CROSSCOMP_FALSE@gentbl
+@CROSSCOMP_FALSE@noinst_PROGRAMS = gentbl
 
-eppfm_SOURCES = \
-	main.c audio.c eppfm.h costab.c \
-	support.c support.h \
-	interface.c interface.h \
-	callbacks.c callbacks.h
+eppfm_SOURCES =  	main.c audio.c eppfm.h costab.c 	support.c support.h 	interface.c interface.h 	callbacks.c callbacks.h
 
 
-eppfm_LDADD = \
-	$(top_builddir)/main/libinit.a $(top_builddir)/main/libresident.a \
-	$(GTK_LIBS) $(top_builddir)/main/libmisc.a $(DIRECTXLIBS)
+eppfm_LDADD =  	$(top_builddir)/main/libinit.a $(top_builddir)/main/libresident.a 	$(GTK_LIBS) $(top_builddir)/main/libmisc.a $(DIRECTXLIBS)
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -152,12 +144,12 @@
 LIBS = @LIBS@
 eppfm_OBJECTS =  main.$(OBJEXT) audio.$(OBJEXT) costab.$(OBJEXT) \
 support.$(OBJEXT) interface.$(OBJEXT) callbacks.$(OBJEXT)
-@DIRECTX_TRUE@eppfm_DEPENDENCIES =  $(top_builddir)/main/libinit.a \
-@DIRECTX_TRUE@$(top_builddir)/main/libresident.a \
-@DIRECTX_TRUE@$(top_builddir)/main/libmisc.a
 @DIRECTX_FALSE@eppfm_DEPENDENCIES =  $(top_builddir)/main/libinit.a \
 @DIRECTX_FALSE@$(top_builddir)/main/libresident.a \
 @DIRECTX_FALSE@$(top_builddir)/main/libmisc.a
+@DIRECTX_TRUE@eppfm_DEPENDENCIES =  $(top_builddir)/main/libinit.a \
+@DIRECTX_TRUE@$(top_builddir)/main/libresident.a \
+@DIRECTX_TRUE@$(top_builddir)/main/libmisc.a
 eppfm_LDFLAGS = 
 @CROSSCOMP_FALSE@gentbl_OBJECTS =  gentbl.$(OBJEXT)
 gentbl_LDADD = $(LDADD)
@@ -172,8 +164,10 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/audio.P .deps/callbacks.P .deps/costab.P \
+.deps/gentbl.P .deps/interface.P .deps/main.P .deps/support.P
 SOURCES = $(eppfm_SOURCES) $(gentbl_SOURCES)
 OBJECTS = $(eppfm_OBJECTS) $(gentbl_OBJECTS)
 
@@ -181,9 +175,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps eppfm/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu eppfm/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -222,9 +216,6 @@
 
 maintainer-clean-noinstPROGRAMS:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -273,7 +264,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -289,6 +280,11 @@
 subdir = eppfm
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu eppfm/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -299,20 +295,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-audio.o: audio.c ../config.h ../main/getopt.h eppfm.h ../main/fpga.h \
-	../main/sysdeps.h ../main/parport.h
-callbacks.o: callbacks.c ../config.h eppfm.h ../main/fpga.h \
-	../main/sysdeps.h ../main/getopt.h ../main/parport.h \
-	callbacks.h interface.h support.h
-costab.o: costab.c eppfm.h ../main/fpga.h ../main/sysdeps.h ../config.h \
-	../main/getopt.h ../main/parport.h
-gentbl.o: gentbl.c
-interface.o: interface.c ../config.h ../main/getopt.h callbacks.h \
-	interface.h support.h
-main.o: main.c ../config.h ../main/getopt.h eppfm.h ../main/fpga.h \
-	../main/sysdeps.h ../main/parport.h interface.h support.h
-support.o: support.c ../config.h ../main/getopt.h support.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -351,26 +365,27 @@
 maintainer-clean-generic:
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
-		clean-tags clean-generic mostlyclean-am
+		clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
-		distclean-compile distclean-tags distclean-generic \
-		clean-am
+		distclean-compile distclean-tags distclean-depend \
+		distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
 		maintainer-clean-noinstPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -382,12 +397,13 @@
 clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 @CROSSCOMP_FALSE@$(srcdir)/costab.c:	gentbl
--- baycomepp-0.10.orig/eppfm2/Makefile.in
+++ baycomepp-0.10/eppfm2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -132,14 +132,14 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps eppfm2/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu eppfm2/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -222,7 +222,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -238,6 +238,11 @@
 subdir = eppfm2
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu eppfm2/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
--- baycomepp-0.10.orig/eppfm2/src/Makefile.in
+++ baycomepp-0.10/eppfm2/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -110,50 +110,30 @@
 VERSION = @VERSION@
 WINDRES = @WINDRES@
 
-INCLUDES = \
-	-I$(top_srcdir)/intl \
-	-I$(top_srcdir)/main \
-	-I$(top_srcdir)/directx/include \
-	-I$(top_srcdir)/directx/include/directx6 \
-	@GTK_CFLAGS@
-
-@DIRECTX_TRUE@AUDIOSRC = @DIRECTX_TRUE@audiowin32.c
-@DIRECTX_FALSE@AUDIOSRC = @DIRECTX_FALSE@audiolinux.c
-@DIRECTX_TRUE@DIRECTXLIBS = @DIRECTX_TRUE@-L$(top_builddir)/directx -ldsound -luser32 -lgdi32
+INCLUDES =  	-I$(top_srcdir)/intl 	-I$(top_srcdir)/main 	-I$(top_srcdir)/directx/include 	-I$(top_srcdir)/directx/include/directx6 	@GTK_CFLAGS@
+
+@DIRECTX_TRUE@AUDIOSRC = audiowin32.c
+@DIRECTX_FALSE@AUDIOSRC = audiolinux.c
+@DIRECTX_TRUE@DIRECTXLIBS = -L$(top_builddir)/directx -ldsound -luser32 -lgdi32
 @DIRECTX_FALSE@DIRECTXLIBS = 
 
-@HAVEGTK_TRUE@bin_PROGRAMS = @HAVEGTK_TRUE@eppfm
+@HAVEGTK_TRUE@bin_PROGRAMS = eppfm
 
 EXTRA_DIST = costab.c gentbl.c audiolinux.c audiowin32.c coeff.m
 
-@CROSSCOMP_FALSE@gentbl_SOURCES = @CROSSCOMP_FALSE@gentbl.c
+@CROSSCOMP_FALSE@gentbl_SOURCES = gentbl.c
+
+@CROSSCOMP_FALSE@BUILT_SOURCES = costab.c
+
+@CROSSCOMP_FALSE@noinst_PROGRAMS = gentbl
+
+eppfm_SOURCES =  	main.c costab.c audio.c $(AUDIOSRC) 	support.c support.h 	interface.c interface.h 	callbacks.h 	widgets.c widgets.h
 
-@CROSSCOMP_FALSE@BUILT_SOURCES = @CROSSCOMP_FALSE@costab.c
 
-@CROSSCOMP_FALSE@noinst_PROGRAMS = @CROSSCOMP_FALSE@gentbl
+eppfm_LDADD = @GTK_LIBS@ $(INTLLIBS) 	$(top_builddir)/main/libinit.a 	$(top_builddir)/main/libresident.a 	$(top_builddir)/main/libresident2.a 	$(top_builddir)/main/libmisc.a $(DIRECTXLIBS)
 
-eppfm_SOURCES = \
-	main.c costab.c audio.c $(AUDIOSRC) \
-	support.c support.h \
-	interface.c interface.h \
-	callbacks.h \
-	widgets.c widgets.h
-
-
-eppfm_LDADD = @GTK_LIBS@ $(INTLLIBS) \
-	$(top_builddir)/main/libinit.a \
-	$(top_builddir)/main/libresident.a \
-	$(top_builddir)/main/libresident2.a \
-	$(top_builddir)/main/libmisc.a $(DIRECTXLIBS)
-
-
-noinst_HEADERS = \
-	eppfm.h     \
-	getopt.h    \
-	callbacks.h \
-	interface.h \
-	support.h   \
-	widgets.h
+
+noinst_HEADERS =  	eppfm.h     	getopt.h    	callbacks.h 	interface.h 	support.h   	widgets.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
@@ -167,20 +147,20 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-@DIRECTX_TRUE@eppfm_OBJECTS =  main.$(OBJEXT) costab.$(OBJEXT) \
-@DIRECTX_TRUE@audio.$(OBJEXT) audiowin32.$(OBJEXT) support.$(OBJEXT) \
-@DIRECTX_TRUE@interface.$(OBJEXT) widgets.$(OBJEXT)
 @DIRECTX_FALSE@eppfm_OBJECTS =  main.$(OBJEXT) costab.$(OBJEXT) \
 @DIRECTX_FALSE@audio.$(OBJEXT) audiolinux.$(OBJEXT) support.$(OBJEXT) \
 @DIRECTX_FALSE@interface.$(OBJEXT) widgets.$(OBJEXT)
-@DIRECTX_TRUE@eppfm_DEPENDENCIES =  $(top_builddir)/main/libinit.a \
-@DIRECTX_TRUE@$(top_builddir)/main/libresident.a \
-@DIRECTX_TRUE@$(top_builddir)/main/libresident2.a \
-@DIRECTX_TRUE@$(top_builddir)/main/libmisc.a
+@DIRECTX_TRUE@eppfm_OBJECTS =  main.$(OBJEXT) costab.$(OBJEXT) \
+@DIRECTX_TRUE@audio.$(OBJEXT) audiowin32.$(OBJEXT) support.$(OBJEXT) \
+@DIRECTX_TRUE@interface.$(OBJEXT) widgets.$(OBJEXT)
 @DIRECTX_FALSE@eppfm_DEPENDENCIES =  $(top_builddir)/main/libinit.a \
 @DIRECTX_FALSE@$(top_builddir)/main/libresident.a \
 @DIRECTX_FALSE@$(top_builddir)/main/libresident2.a \
 @DIRECTX_FALSE@$(top_builddir)/main/libmisc.a
+@DIRECTX_TRUE@eppfm_DEPENDENCIES =  $(top_builddir)/main/libinit.a \
+@DIRECTX_TRUE@$(top_builddir)/main/libresident.a \
+@DIRECTX_TRUE@$(top_builddir)/main/libresident2.a \
+@DIRECTX_TRUE@$(top_builddir)/main/libmisc.a
 eppfm_LDFLAGS = 
 @CROSSCOMP_FALSE@gentbl_OBJECTS =  gentbl.$(OBJEXT)
 gentbl_LDADD = $(LDADD)
@@ -197,8 +177,11 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/audio.P .deps/audiolinux.P .deps/audiowin32.P \
+.deps/costab.P .deps/gentbl.P .deps/interface.P .deps/main.P \
+.deps/support.P .deps/widgets.P
 SOURCES = $(eppfm_SOURCES) $(gentbl_SOURCES)
 OBJECTS = $(eppfm_OBJECTS) $(gentbl_OBJECTS)
 
@@ -206,9 +189,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps eppfm2/src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu eppfm2/src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -247,9 +230,6 @@
 
 maintainer-clean-noinstPROGRAMS:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -298,7 +278,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -314,6 +294,11 @@
 subdir = eppfm2/src
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu eppfm2/src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -324,21 +309,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-audio.o: audio.c ../../config.h eppfm.h ../../main/fpga.h \
-	../../main/sysdeps.h getopt.h ../../main/parport.h
-audiolinux.o: audiolinux.c ../../config.h getopt.h eppfm.h \
-	../../main/fpga.h ../../main/sysdeps.h ../../main/parport.h
-costab.o: costab.c eppfm.h ../../main/fpga.h ../../main/sysdeps.h \
-	../../config.h getopt.h ../../main/parport.h
-gentbl.o: gentbl.c
-interface.o: interface.c ../../config.h getopt.h callbacks.h interface.h \
-	support.h
-main.o: main.c ../../config.h getopt.h eppfm.h ../../main/fpga.h \
-	../../main/sysdeps.h ../../main/parport.h widgets.h callbacks.h \
-	interface.h support.h
-support.o: support.c ../../config.h getopt.h support.h
-widgets.o: widgets.c ../../config.h widgets.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -377,26 +379,27 @@
 maintainer-clean-generic:
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
-		clean-tags clean-generic mostlyclean-am
+		clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
-		distclean-compile distclean-tags distclean-generic \
-		clean-am
+		distclean-compile distclean-tags distclean-depend \
+		distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
 		maintainer-clean-noinstPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -408,12 +411,13 @@
 clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 @CROSSCOMP_FALSE@$(srcdir)/costab.c:	gentbl
--- baycomepp-0.10.orig/flexdrv/Makefile.in
+++ baycomepp-0.10/flexdrv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -114,16 +114,16 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/misc -I$(top_srcdir)/main
 
-@WIN32_TRUE@noinst_LIBRARIES = @WIN32_TRUE@libflxdrv.a
+@WIN32_TRUE@noinst_LIBRARIES = libflxdrv.a
 
-@WIN32_TRUE@libflxdrv_a_SOURCES = @WIN32_TRUE@driver.c bayeppflex.c
+@WIN32_TRUE@libflxdrv_a_SOURCES = driver.c bayeppflex.c
 
-@WIN32_TRUE@DLLNAME = @WIN32_TRUE@bayeppflex
-@WIN32_TRUE@DLLOBJ = @WIN32_TRUE@driver.o bayeppflex.o bayeppflex.res ../main/libinit.a ../main/libresident.a ../main/libresident2.a ../main/libmisc.a
+@WIN32_TRUE@DLLNAME = bayeppflex
+@WIN32_TRUE@DLLOBJ = driver.o bayeppflex.o bayeppflex.res ../main/libinit.a ../main/libresident.a ../main/libresident2.a ../main/libmisc.a
 @WIN32_TRUE@DLLLDARGS = 
-@WIN32_TRUE@DLLDEF = @WIN32_TRUE@--def $(srcdir)/flexdriv.def
+@WIN32_TRUE@DLLDEF = --def $(srcdir)/flexdriv.def
 
-@WIN32_TRUE@noinst_SCRIPTS = @WIN32_TRUE@$(DLLNAME).dll
+@WIN32_TRUE@noinst_SCRIPTS = $(DLLNAME).dll
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -147,8 +147,9 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/bayeppflex.P .deps/driver.P
 SOURCES = $(libflxdrv_a_SOURCES)
 OBJECTS = $(libflxdrv_a_OBJECTS)
 
@@ -156,9 +157,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flexdrv/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu flexdrv/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -172,9 +173,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -220,7 +218,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -236,6 +234,11 @@
 subdir = flexdrv
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu flexdrv/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -247,6 +250,37 @@
 	  fi; \
 	done
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -283,23 +317,25 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -309,12 +345,13 @@
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 @WIN32_TRUE@bayeppflex.res:	bayeppflex.rc resource.h
--- baycomepp-0.10.orig/ntdrv/Makefile.in
+++ baycomepp-0.10/ntdrv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -112,9 +112,9 @@
 
 EXTRA_DIST = eppflex.c eppflex.rc eppflex.h eppflex.inf eppflex.sys testload.c sources makefile
 
-@WIN32_TRUE@noinst_PROGRAMS = @WIN32_TRUE@testload
+@WIN32_TRUE@noinst_PROGRAMS = testload
 
-@WIN32_TRUE@testload_SOURCES = @WIN32_TRUE@testload.c
+@WIN32_TRUE@testload_SOURCES = testload.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -139,8 +139,9 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/testload.P
 SOURCES = $(testload_SOURCES)
 OBJECTS = $(testload_OBJECTS)
 
@@ -148,9 +149,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps ntdrv/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu ntdrv/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -164,9 +165,6 @@
 
 maintainer-clean-noinstPROGRAMS:
 
-.c.o:
-	$(COMPILE) -c $<
-
 # FIXME: We should only use cygpath when building on Windows,
 # and only if it is available.
 .c.obj:
@@ -211,7 +209,7 @@
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -227,6 +225,11 @@
 subdir = ntdrv
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu ntdrv/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -238,6 +241,37 @@
 	  fi; \
 	done
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -274,23 +308,24 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstPROGRAMS clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstPROGRAMS clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstPROGRAMS distclean-compile distclean-tags \
-		distclean-generic clean-am
+		distclean-depend distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -300,12 +335,13 @@
 clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- baycomepp-0.10.orig/w9xdrv/Makefile.in
+++ baycomepp-0.10/w9xdrv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -119,14 +119,14 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps w9xdrv/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu w9xdrv/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -139,6 +139,11 @@
 subdir = w9xdrv
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu w9xdrv/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
--- baycomepp-0.10.orig/debian/watch
+++ baycomepp-0.10/debian/watch
@@ -0,0 +1,3 @@
+# Site		Directory		Pattern			Version	Script
+version=2
+http://www.baycom.org/bayweb/term/jnx/	baycomepp-(.*)\.tar\.gz	debian	uupdate
--- baycomepp-0.10.orig/debian/changelog
+++ baycomepp-0.10/debian/changelog
@@ -0,0 +1,58 @@
+baycomepp (0.10-8.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update build-deps for xlibs-dev removal; closes: #346650.
+
+ -- Justin Pryzby <justinpryzby@users.sf.net>  Mon, 16 Jan 2006 01:11:52 -0500
+
+baycomepp (0.10-8) unstable; urgency=low
+
+  * Fixed a FTBFS due to jumps into statement expressions, patch by Matt
+    Kraai, thanks! Closes: #317865.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Tue, 12 Jul 2005 10:05:29 +0200
+
+baycomepp (0.10-7) unstable; urgency=low
+
+  * Watch file added.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Sat,  7 Aug 2004 10:11:33 +0200
+
+baycomepp (0.10-6) unstable; urgency=low
+
+  * Patch by Andreas Jochens for gcc-3.4. Closes: #260147.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Sun, 18 Jul 2004 23:48:35 +0200
+
+baycomepp (0.10-5) unstable; urgency=low
+
+  * Add -fPIC to INCLUDES line in main/Makefile.am and run automake.
+    Closes: #257176.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Sat,  3 Jul 2004 00:09:10 +0200
+
+baycomepp (0.10-4) unstable; urgency=low
+
+  * Add amd64 to architecture list. Closes: #253803.
+  * Thanks to Andreas Jochens.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Wed, 30 Jun 2004 19:32:44 +0200
+
+baycomepp (0.10-3) unstable; urgency=low
+
+  * On alpha define insb and outsb functions (main/sysdeps.h). 
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Sun, 25 Jan 2004 11:07:32 +0100
+
+baycomepp (0.10-2) unstable; urgency=low
+
+  * Remove ntdrv/makefile prior to building. Closes: #229304.
+  * Make this an i386/alpha only build, because of inb/outb commands.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Sat, 24 Jan 2004 15:32:07 +0100
+
+baycomepp (0.10-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Joop Stakenborg <pa3aba@debian.org>  Tue, 13 Jan 2004 21:35:13 +0100
--- baycomepp-0.10.orig/debian/copyright
+++ baycomepp-0.10/debian/copyright
@@ -0,0 +1,10 @@
+This package was debianized by Joop Stakenborg pa3aba@debian.org on
+Tue, 13 Jan 2004 21:35:13 +0100.
+
+It was downloaded from http://www.baycom.org/bayweb/term/jnx/epp.html
+
+Copyright:
+
+Baycomepp was writen by Thomas Sailer, <sailer@ife.ee.ethz.ch> and published
+under the GPL license. There should be a copy of the GPL license on your
+debian system at /usr/share/common-licenses/GPL
--- baycomepp-0.10.orig/debian/dirs
+++ baycomepp-0.10/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- baycomepp-0.10.orig/debian/control
+++ baycomepp-0.10/debian/control
@@ -0,0 +1,14 @@
+Source: baycomepp
+Section: hamradio
+Priority: optional
+Maintainer: Joop Stakenborg <pa3aba@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debmake, libgtk1.2-dev, libxml-dev, zlib1g-dev
+
+Package: baycomepp
+Architecture: i386 alpha amd64
+Depends: ${shlibs:Depends}
+Description: Drivers for the HB9JNX packet radio epp modem
+ This package provides drivers for the baycom epp packet radio modem designed
+ by HB9JNX, see http://www.baycom.org/bayweb/term/jnx/epp.html
+
--- baycomepp-0.10.orig/debian/rules
+++ baycomepp-0.10/debian/rules
@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+# Made with the aid of debmake, by Christoph Lameter,
+# based on the sample debian/rules file for GNU hello by Ian Jackson.
+
+package=baycomepp
+
+build:
+	$(checkdir)
+	./configure --prefix=/usr --libexecdir=\$${prefix}/lib
+	$(MAKE) CFLAGS="-O2 -g -Wall"
+	touch build
+
+clean:
+	$(checkdir)
+	rm -f build
+	-$(MAKE) distclean
+	rm -f `find . -name "*~"`
+	rm -rf debian/tmp debian/files* core debian/substvars
+	rm -f ntdrv/makefile*
+
+binary-indep: checkroot build
+	$(checkdir)
+# There are no architecture-independent files to be uploaded
+# generated by this package.  If there were any they would be
+# made here.
+
+binary-arch: checkroot build
+	$(checkdir)
+	rm -rf debian/tmp
+	install -d debian/tmp
+	cd debian/tmp && install -d `cat ../dirs`
+	$(MAKE) install prefix=`pwd`/debian/tmp/usr
+	chmod -x debian/tmp/usr/lib/baycomfpga_init.so
+	strip --strip-unneeded debian/tmp/usr/lib/baycomfpga_init.so
+# Must have debmake installed for this to work. Otherwise please copy
+# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
+	debstd
+	dpkg-gencontrol -isp
+	chown -R root:root debian/tmp
+	chmod -R go=rX debian/tmp
+	dpkg --build debian/tmp ..
+
+define checkdir
+	test -f debian/rules
+endef
+
+binary: binary-indep binary-arch
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot