--- Imakefile.orig	Sun Mar 21 23:36:26 1999
+++ Imakefile	Mon Mar 22 18:13:13 1999
@@ -96,7 +96,7 @@
 XCOMM   to link against symbols inside xanim.
 XCOMM 
 XCOMM ## Linux
-LD_FLAGS = -rdynamic
+XCOMM LD_FLAGS = -rdynamic
 XCOMM ## SunOS/Solaris use:
 XCOMM  LD_FLAGS =
 
@@ -111,17 +111,17 @@
 XCOMM NOTE: not all machines need the XA_DLL_LIB define.
 XCOMM #########################################################################
 XCOMM 
-XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT
 XCOMM ### Use this only if the above doesn't work
 XCOMM XA_DLL_DEF = -DXA_DLL
 XCOMM
 XCOMM ### You may need this library.
-XA_DLL_LIB = -ldl
+XCOMM XA_DLL_LIB = -ldl
 XCOMM
 XCOMM If you'd like to change the default directory that XAnim searches while
 XCOMM looking for dlls, then change the directory below.
 XCOMM
-XA_DLL_PATH = /usr/local/xanim/mods
+XCOMM XA_DLL_PATH = /usr/local/xanim/mods
 
 
 
@@ -267,8 +267,8 @@
 XCOMM  XA_AUDIO_DEFS =
 XCOMM 
 XCOMM ## -- Linux PCs ---------------------------------------------------------
-XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
-XA_AUDIO_LIBS = -lc
+XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+XCOMM XA_AUDIO_LIBS = -lc
 XCOMM 
 XCOMM  -- Linux PC's with OLD Rev sound drivers -------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND
@@ -309,6 +309,9 @@
 XCOMM  -- NetBSD-current (as of 30/April 1995)---------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_NetBSD_AUDIO
 XCOMM 
+XCOMM  -- OpenBSD, from at least 2.4 to now
+XA_AUDIO_DEFS = -DXA_OpenBSD_AUDIO
+XCOMM 
 XCOMM  -- QNX 4.2 PC's --------------------------------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_SELECT
 XCOMM  XA_AUDIO_LIBS = -lc
@@ -442,7 +445,7 @@
 XCOMM    -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
 XCOMM    --  XmbufCreateBuffers).
 XCOMM    -- NOTE_8: HP-UX machines need to comment this out.
-XCOMM  XA_MULTIBUF = -DXMBUF
+XA_MULTIBUF = -DXMBUF
 XCOMM 
 XCOMM ###########
 XCOMM 
@@ -465,7 +468,7 @@
 
 PROGRAMS = $(XANIM)
 
-INCLUDES = -I$(INCDIR) $(XA_INCS)
+INCLUDES = -I/usr/X11R6/include/X11 $(XA_INCS)
 
    LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
 DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)
@@ -504,43 +507,3 @@
 xaclean::
 	$(RM) $(OBJS1)
 
-
-XCOMM  DO NOT DELETE THIS LINE
-xanim.o: Imakefile xanim.h xa_config.h xa_x11.h xanim.c
-xa1.0_kpcd.o: xa1.0_kpcd.c
-unpacker.o: unpacker.c
-xa_acodec.o: Imakefile xanim.h xa_acodec.c
-xa_act.o: xanim.h xa_config.h xa_act.c
-xa_au.o: xanim.h xa_config.h xa_au.c
-xa_audio.o: Imakefile xanim.h xa_config.h xa_audio.h xa_audio.c
-xa_avi.o: Imakefile xanim.h xa_config.h xa_avi.h xa_codecs.h xa_xmpg.h xa_avi.c
-xa_cmap.o: xanim.h xa_config.h xa_cmap.c
-xa_color.o: xanim.h xa_color.c
-xa_dl.o: xanim.h xa_config.h xa_dl.h xa_dl.c
-xa_dumfx.o: xanim.h xa_dumfx.c
-xa_fli.o: xanim.h xa_config.h xa_fli.h xa_fli.c
-xa_formats.o: xanim.h xa_formats.c
-xa_gif.o: xanim.h xa_config.h xa_gif.h xa_gif.c
-xa_iff.o: xanim.h xa_config.h xa_iff.h xa_iff.c
-xa_input.o: xanim.h xa_input.c
-xa_ipc.o: Imakefile xanim.h xa_config.h xa_ipc.h xa_ipc.c
-xa_jmov.o: xanim.h xa_config.h xa_jmov.h xa_jmov.c
-xa_jpg.o: xanim.h xa_config.h xa_jpg.h xa_jpg.c
-xa_j6i.o: xanim.h xa_j6i.h xa_j6i.c
-xa_movi.o: xanim.h xa_config.h xa_movi.h xa_movi.c
-xa_mpg.o: xanim.h xa_config.h xa_mpg.h xa_xmpg.h xa_mpg.c xa_jpg.c
-xa_qt.o: Imakefile xanim.h xa_config.h xa_qt.h xa_codecs.h xa_qt.c
-xa_qt_decs.o: Imakefile xanim.h xa_config.h xa_qt.h xa_qt_decs.c
-xa_vid_codec.o: Imakefile xa_avi.h xa_qt.h xa_codecs.h xavid.h xavid_mod.h
-xa_vid_codec.o: xa_vid_codec.c
-xa_replay.o: xanim.h xa_config.h xa_replay.h xa_replay.c
-xa_rle.o: xanim.h xa_config.h xa_rle.h xa_rle.c
-xa_set.o: xanim.h xa_config.h xa_iff.h xa_iff.c xa_set.h xa_set.c
-xa_raw.o: xanim.h xa_raw.h xa_raw.c
-xa_show.o: Imakefile xanim.h xa_show.c
-xa_txt.o: xanim.h xa_config.h xa_txt.c
-xa_utils.o: xanim.h xa_config.h xa_utils.c
-xa_wav.o: xanim.h xa_config.h xa_avi.h xa_wav.c
-xa_8svx.o: xanim.h xa_8svx.h xa_8svx.c
-xa_x11.o: Imakefile xanim.h xa_config.h xa_x11.h xa_x11.c
-xa_gsm.o: xanim.h xa_gsm_state.h xa_gsm.h xa_gsm.c