diff --git a/.gitattributes b/.gitattributes
index d2eb13f..879522c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,8 +6,6 @@ freeglut/freeglut/ChangeLog svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/FrequentlyAskedQuestions -text
 freeglut/freeglut/LISEZMOI.cygwin_mingw svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/LISEZ_MOI svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/Makefile.am svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/Makefile.wat svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/NEWS svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/README svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/README.android -text
@@ -22,8 +20,6 @@ freeglut/freeglut/android/README -text
 freeglut/freeglut/android_toolchain.cmake -text
 freeglut/freeglut/autogen.sh svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/config.h.in svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/configure.ac svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/doc/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/doc/download.html svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/doc/freeglut.html svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/doc/freeglut_logo.png -text
@@ -43,41 +39,27 @@ freeglut/freeglut/freeglut_evc4.vcp svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/freeglut_evc4.vcw svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/freeglut_static.dep -text
 freeglut/freeglut/freeglut_static.mak -text
-freeglut/freeglut/include/GL/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/include/GL/freeglut.h svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/include/GL/freeglut_ext.h svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/include/GL/freeglut_std.h svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/include/GL/glut.h svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/include/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/mingw_cross_toolchain.cmake -text
-freeglut/freeglut/progs/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/CallbackMaker/CallbackMaker.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/Fractals/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/Fractals/fractals.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/Fractals/fractals.dat svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/Fractals_random/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/Fractals_random/fractals.dat svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/Fractals_random/fractals_random.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/Lorenz/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/Lorenz/lorenz.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/Makefile.am svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/One/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/One/one.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/Resizer/Resizer.cpp -text
-freeglut/freeglut/progs/demos/shapes/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/progs/demos/shapes/shapes.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am -text
 freeglut/freeglut/progs/demos/smooth_opengl3/smooth_opengl3.c -text
-freeglut/freeglut/progs/demos/spaceball/Makefile.am -text
 freeglut/freeglut/progs/demos/spaceball/spaceball.c -text
 freeglut/freeglut/progs/demos/spaceball/vmath.c -text
 freeglut/freeglut/progs/demos/spaceball/vmath.h -text
 freeglut/freeglut/progs/demos/spaceball/vmath.inl -text
-freeglut/freeglut/progs/demos/subwin/Makefile.am -text
 freeglut/freeglut/progs/demos/subwin/subwin.c -text
 freeglut/freeglut/progs/demos/timer/timer.c -text
-freeglut/freeglut/src/Makefile.am svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/android/fg_gamemode_android.c -text
 freeglut/freeglut/src/android/fg_input_devices_android.c -text
 freeglut/freeglut/src/android/fg_internal_android.h -text
diff --git a/freeglut/freeglut/Makefile.am b/freeglut/freeglut/Makefile.am
deleted file mode 100644
index 6b3cbe5..0000000
--- a/freeglut/freeglut/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = src include progs doc
-AUTOMAKE_OPTIONS = gnu
-
-EXTRA_DIST = \
-	FrequentlyAskedQuestions \
-	LISEZ_MOI \
-	README.win32 \
-	autogen.sh \
-	freeglut.dep \
-	freeglut.dsp \
-	freeglut.dsw \
-	freeglut.kdevelop \
-	freeglut.kdevprj \
-	freeglut.lsm \
-	freeglut.mak \
-	freeglut.rc \
-	freeglut.spec \
-	freeglut_evc4.vcp \
-	freeglut_evc4.vcw \
-	freeglut_static.dep \
-	freeglut_static.dsp \
-	freeglut_static.mak \
-	VisualStudio/2010/freeglut.vcxproj.filters \
-	VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj.filters \
-	VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj \
-	VisualStudio/2010/One/One.vcxproj \
-	VisualStudio/2010/One/One.vcxproj.filters \
-	VisualStudio/2010/Fractals_random/Fractals_random.vcxproj \
-	VisualStudio/2010/Fractals_random/Fractals_random.vcxproj.filters \
-	VisualStudio/2010/Resizer/Resizer.vcxproj \
-	VisualStudio/2010/Resizer/Resizer.vcxproj.filters \
-	VisualStudio/2010/freeglut.sln \
-	VisualStudio/2010/Lorenz/Lorenz.vcxproj.filters \
-	VisualStudio/2010/Lorenz/Lorenz.vcxproj \
-	VisualStudio/2010/shapes/shapes.vcxproj.filters \
-	VisualStudio/2010/shapes/shapes.vcxproj \
-	VisualStudio/2010/Fractals/Fractals.vcxproj.filters \
-	VisualStudio/2010/Fractals/Fractals.vcxproj \
-	VisualStudio/2010/freeglut.vcxproj \
-	VisualStudio/2010/subwin/subwin.vcxproj.filters \
-	VisualStudio/2010/subwin/subwin.vcxproj \
-	VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj \
-	VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj.filters \
-	VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj \
-	VisualStudio/2008/One/One.vcproj \
-	VisualStudio/2008/Fractals_random/Fractals_random.vcproj \
-	VisualStudio/2008/Resizer/Resizer.vcproj \
-	VisualStudio/2008/freeglut.sln \
-	VisualStudio/2008/Lorenz/Lorenz.vcproj \
-	VisualStudio/2008/shapes/shapes.vcproj \
-	VisualStudio/2008/Fractals/Fractals.vcproj \
-	VisualStudio/2008/subwin/subwin.vcproj \
-	VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj \
-	VisualStudio/2008/freeglut.vcproj \
-	progs/demos/CallbackMaker/CallbackMakerStatic.dsp \
-	progs/demos/Fractals/FractalsStatic.dsp \
-	progs/demos/Fractals_random/Fractals_randomStatic.dsp \
-	progs/demos/Lorenz/lorenzStatic.dsp \
-	progs/demos/One/oneStatic.dsp \
-	progs/demos/shapes/shapesStatic.dsp \
-	progs/demos/smooth_opengl3/smooth_opengl3Static.dsp
-
-# Thanks to WinDoze, some files in CVS have the "execute" bit set when they
-# shouldn't. We could fix this if we had direct access to the CVS repository,
-# but we are not that lucky. Instead we fix this at distribution creation time.
-dist-hook:
-	find $(distdir) -type f \( \
-	    -name "*.c" -o \
-	    -name "*.dsp" -o \
-	    -name "*.dsw" -o \
-	    -name "*.h" -o \
-	    -name "*.html" -o \
-	    -name "*.png" -o \
-	    -name "LISEZ_MOI" -o \
-	    -name "README*" \
-	    \) -exec chmod -x {} \;
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
diff --git a/freeglut/freeglut/Makefile.wat b/freeglut/freeglut/Makefile.wat
deleted file mode 100644
index aebf92b..0000000
--- a/freeglut/freeglut/Makefile.wat
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# Makefile.wat
-# Open Watcom makefile for Freeglut
-# Usage:
-#    wmake -f Makefile.wat {target}
-# Where target is one of:
-#    debug-static
-#    debug-dynamic
-#    release-static
-#    release-dynamic
-#    debug
-#    release
-#    all
-#    clean
-# Assumes:
-#    WATCOM enviroment variable points to your Watcom installation directory
-#    %WATCOM%\BINNT and %WATCOM%\BINW are in your path
-#
-RELEASE_STATIC_DIR = release-static
-RELEASE_DYNAMIC_DIR = release-dynamic
-DEBUG_STATIC_DIR = debug-static
-DEBUG_DYNAMIC_DIR = debug-dynamic
-
-INCLUDE_DIR = ..\include
-SRC_DIR = ..\src\Common
-COMPILER = wcc386
-COMPILE_COMMON_OPTIONS = -i$(INCLUDE_DIR);$(%WATCOM)\h;$(%WATCOM)\h\nt -fp6 -w4 -e25 -wcd202 -bt=nt -mf -zq
-COMPILE_DEBUG_OPTIONS = -d3 -od -DDEBUG -D_DEBUG
-COMPILE_RELEASE_OPTIONS = -d0 -otexanh
-COMPILE_STATIC_OPTIONS = -DFREEGLUT_STATIC -6r
-COMPILE_DYNAMIC_OPTIONS = -DFREEGLUT_EXPORTS -6s -bd -bm
-COMPILE_OPTIONS = $(COMPILE_COMMON_OPTIONS) $(COMPILE_$(MODE)_OPTIONS) $(COMPILE_$(TYPE)_OPTIONS)
-
-LINKER = wlink
-LINK_OPTIONS = SYS nt_dll op m op maxe=25 op q op symf FIL
-
-LIB_TOOL = wlib
-LIB_COMMON_OPTIONS = -q -n -b
-LIB_DYNAMIC_OPTIONS =
-LIB_STATIC_OPTIONS = -c -p=512
-LIB_OPTIONS = $(LIB_COMMON_OPTIONS) $(LIB_$(TYPE)_OPTIONS)
-
-MAKE = wmake -h -f ..\Makefile.wat 
-
-OBJ_FILES = &
-	freeglut_callbacks.obj &
-	freeglut_cursor.obj &
-	freeglut_display.obj &
-	freeglut_ext.obj &
-	freeglut_font.obj &
-	freeglut_font_data.obj &
-	freeglut_gamemode.obj &
-	freeglut_geometry.obj &
-	freeglut_glutfont_definitions.obj &
-	freeglut_init.obj &
-	freeglut_input_devices.obj &
-	freeglut_joystick.obj &
-	freeglut_main.obj &
-	freeglut_menu.obj &
-	freeglut_misc.obj &
-	freeglut_overlay.obj &
-	freeglut_spaceball.obj &
-	freeglut_state.obj &
-	freeglut_stroke_mono_roman.obj &
-	freeglut_stroke_roman.obj &
-	freeglut_structure.obj &
-	freeglut_teapot.obj &
-	freeglut_videoresize.obj &
-	freeglut_window.obj
-
-default : .SYMBOLIC
-	@echo Usage:
-	@echo 	wmake -f Makefile.wat {target}
-	@echo Where target is one of:
-	@echo   debug-static
-	@echo   debug-dynamic
-	@echo   release-static
-	@echo   release-dynamic
-	@echo   debug
-	@echo   release
-	@echo   all
-	@echo   clean
-
-# static library
-freeglut_static.lib : $(OBJ_FILES)
-	$(LIB_TOOL) $(LIB_OPTIONS) $^* $(OBJ_FILES)
-
-# dynamic link library
-freeglut.dll : $(OBJ_FILES)
-	$(LINKER) name $^* $(LINK_OPTIONS) $(OBJ_FILES: =,)
-
-freeglut.lib : freeglut.dll
-	$(LIB_TOOL) $(LIB_OPTIONS) $^. +$[.
-
-
-freeglut_callbacks.obj : $(SRC_DIR)\freeglut_callbacks.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-	
-freeglut_cursor.obj : $(SRC_DIR)\freeglut_cursor.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_display.obj : $(SRC_DIR)\freeglut_display.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_ext.obj : $(SRC_DIR)\freeglut_ext.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_font.obj : $(SRC_DIR)\freeglut_font.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_font_data.obj : $(SRC_DIR)\freeglut_font_data.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_gamemode.obj : $(SRC_DIR)\freeglut_gamemode.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_geometry.obj : $(SRC_DIR)\freeglut_geometry.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_glutfont_definitions.obj : $(SRC_DIR)\freeglut_glutfont_definitions.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_init.obj : $(SRC_DIR)\freeglut_init.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_input_devices.obj : $(SRC_DIR)\freeglut_input_devices.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_joystick.obj : $(SRC_DIR)\freeglut_joystick.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_main.obj : $(SRC_DIR)\freeglut_main.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_menu.obj : $(SRC_DIR)\freeglut_menu.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_misc.obj : $(SRC_DIR)\freeglut_misc.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_overlay.obj : $(SRC_DIR)\freeglut_overlay.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_spaceball.obj : $(SRC_DIR)\freeglut_spaceball.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_state.obj : $(SRC_DIR)\freeglut_state.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_stroke_mono_roman.obj : $(SRC_DIR)\freeglut_stroke_mono_roman.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_stroke_roman.obj : $(SRC_DIR)\freeglut_stroke_roman.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_structure.obj : $(SRC_DIR)\freeglut_structure.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_teapot.obj : $(SRC_DIR)\freeglut_teapot.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_videoresize.obj : $(SRC_DIR)\freeglut_videoresize.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-freeglut_window.obj : $(SRC_DIR)\freeglut_window.c
-	$(COMPILER) $(SRC_DIR)\$[. $(COMPILE_OPTIONS)
-
-clean : .SYMBOLIC
-	@-del $(DEBUG_STATIC_DIR)\*.obj
-	@-del $(DEBUG_DYNAMIC_DIR)\*.obj
-	@-del $(RELEASE_STATIC_DIR)\*.obj
-	@-del $(RELEASE_DYNAMIC_DIR)\*.obj
-	@echo All object files removed
-	
-debug-static : .SYMBOLIC
-	@-if not exist $(DEBUG_STATIC_DIR)\. mkdir $(DEBUG_STATIC_DIR)
-	@-cd $(DEBUG_STATIC_DIR)
-	@$(MAKE) MODE=DEBUG TYPE=STATIC freeglut_static.lib
-	@-cd ..
-	@echo Debug static library up to date
-
-debug-dynamic : .SYMBOLIC
-	@-if not exist $(DEBUG_DYNAMIC_DIR)\. mkdir $(DEBUG_DYNAMIC_DIR)
-	@-cd $(DEBUG_DYNAMIC_DIR)
-	@$(MAKE) MODE=DEBUG TYPE=DYNAMIC freeglut.lib
-	@-cd ..
-	@echo Debug dynamic link library up to date
-
-release-static : .SYMBOLIC
-	@-if not exist $(RELEASE_STATIC_DIR)\. mkdir $(RELEASE_STATIC_DIR)
-	@-cd $(RELEASE_STATIC_DIR)
-	@$(MAKE) MODE=RELEASE TYPE=STATIC freeglut_static.lib
-	@-cd ..
-	@echo Release static library up to date
-
-release-dynamic : .SYMBOLIC
-	@-if not exist $(RELEASE_DYNAMIC_DIR)\. mkdir $(RELEASE_DYNAMIC_DIR)
-	@-cd $(RELEASE_DYNAMIC_DIR)
-	@$(MAKE) MODE=RELEASE TYPE=DYNAMIC freeglut.lib
-	@-cd ..
-	@echo Release dynamic link library up to date
-
-debug : debug-static debug-dynamic .SYMBOLIC
-	@echo Debug targets up to date
-
-release : release-static release-dynamic .SYMBOLIC
-	@echo Release targets up to date
-
-all : debug release .SYMBOLIC
-	@echo All targets up to date
diff --git a/freeglut/freeglut/configure.ac b/freeglut/freeglut/configure.ac
deleted file mode 100644
index 8e835d5..0000000
--- a/freeglut/freeglut/configure.ac
+++ /dev/null
@@ -1,162 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT([freeglut library], [3.0.0], [freeglut-bugs@lists.sourceforge.net], [freeglut])
-AM_INIT_AUTOMAKE
-AC_PREREQ([2.56])
-AC_CONFIG_SRCDIR([AUTHORS])
-AC_CONFIG_HEADERS([config.h])
-
-# Compatibility hack for older autoconf versions
-m4_ifdef([AS_HELP_STRING], [], [AC_DEFUN([AS_HELP_STRING], [AC_HELP_STRING($][@)])])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_C_CONST
-AC_EXEEXT
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-AC_SUBST([LIBTOOL_DEPS])
-
-# Checks for libraries.
-AC_PATH_XTRA
-
-#if test "x$no_x" = xyes; then
-#  GL_LIBS="-lopengl32 -lgdi32 -lwinmm"
-#  LIBXXF86VM=
-#  LIBXI=
-#  VERSION_INFO=
-#  EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
-#else
-#  GL_LIBS="-lGL -lXext -lX11"
-#  AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode])
-#  AC_CHECK_LIB([Xrandr], [XRRQueryExtension])
-#  AC_CHECK_LIB([Xi], [XISelectEvents])
-#  LIBXI=-lXi
-#  VERSION_INFO="-version-info 12:0:9"
-#  EXPORT_FLAGS=
-#fi
-VERSION_INFO="-version-info 12:0:9"
-AM_CONDITIONAL(TARGET_HOST_MS_WINDOWS, false)
-AM_CONDITIONAL(TARGET_HOST_POSIX_X11, false)
-AM_CONDITIONAL(TARGET_HOST_ANDROID, false)
-case "${host}" in
-    *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-	# Windows+Cygwin/MSYS, MinGW cross-compilation
-	GL_LIBS="-lopengl32 -lgdi32 -lwinmm"
-	LIBXXF86VM=
-	LIBXI=
-	CPPFLAGS="$CPPFLAGS -DFREEGLUT_EXPORTS"
-	AM_CONDITIONAL(TARGET_HOST_MS_WINDOWS, true)
-	;;
-    *-*-linux-androideabi)
-	# Android
-	# e.g. arm-unknown-linux-androideabi
-	GL_LIBS="-lEGL -lGLESv2"
-	LIBXXF86VM=
-	LIBXI=
-	#CFLAGS="$CFLAGS"
-	# '-mandroid' is not mandatory but doesn't hurt
-	# '-O0 -gstabs+' helps the currently buggy GDB port, better
-	#   remove it for releases
-	# '-DANDROID' is the Android build system convention
-	CFLAGS="-mandroid -O0 -gstabs+"
-	CPPFLAGS="$CPPFLAGS -DANDROID"
-	AM_CONDITIONAL(TARGET_HOST_ANDROID, true)
-	;;
-    *)
-	# Unix/X11
-	GL_LIBS="-lGL -lXext -lX11"
-	AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode])
-	AC_CHECK_LIB([Xrandr], [XRRQueryExtension])
-	AC_CHECK_LIB([Xi], [XISelectEvents])
-	LIBXI=-lXi
-	AM_CONDITIONAL(TARGET_HOST_POSIX_X11, true)
-	;;
-esac
-
-AC_SUBST([GL_LIBS])
-AC_SUBST([LIBXXF86VM])
-AC_SUBST([LIBXI])
-AC_SUBST([VERSION_INFO])
-AC_SUBST([EXPORT_FLAGS])
-
-AC_CHECK_LIB([usbhid], [hid_init],
-             [LIBUSBHID=-lusbhid], [LIBUSBHID=])
-AC_SUBST(LIBUSBHID)
-
-# Checks for header files.
-AC_HEADER_STDC
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS([usbhid.h libusbhid.h errno.h GL/gl.h GL/glu.h GL/glx.h GLES/gl.h GLES2/gl2.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
-AC_HEADER_TIME
-AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
-AC_CHECK_HEADERS([X11/extensions/Xrandr.h])
-AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
-AC_CHECK_HEADERS([X11/extensions/XInput2.h])
-CPPFLAGS="$save_CPPFLAGS"
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_VPRINTF
-AC_CHECK_LIBM
-AC_SUBST([LIBM])
-AC_CHECK_FUNCS([gettimeofday])
-AC_CHECK_FUNCS([vfprintf])
-
-# Build time configuration.
-AC_ARG_ENABLE([replace-glut],
-[AS_HELP_STRING([--enable-replace-glut],
-                [be a replacement for GLUT @<:@default=yes@:>@])])
-if test "x$enable_replace_glut" != xno; then
-  LIBRARY=glut
-  HEADER=glut.h
-else
-  LIBRARY=freeglut
-  HEADER=
-fi
-AC_SUBST([LIBRARY])
-AC_SUBST([HEADER])
-
-AC_ARG_ENABLE([warnings],
-[AS_HELP_STRING([--enable-warnings],
-                [use all gcc compiler warnings @<:@default=yes@:>@])])
-if test "x$enable_warnings" != xno -a "x$GCC" = xyes; then
-  CFLAGS="$CFLAGS -Wall -pedantic"
-fi
-
-AC_ARG_ENABLE([warnings-as-errors],
-[AS_HELP_STRING([--enable-warnings-as-errors],
-                [make all warnings into errors @<:@default=no@:>@])])
-if test "x$enable_warnings_as_errors" = xyes -a "x$GCC" = xyes; then
-  CFLAGS="$CFLAGS -Werror"
-fi
-
-AC_ARG_ENABLE([debug],
-[AS_HELP_STRING([--enable-debug],
-                [enable debugging code (for developers) @<:@default=no@:>@])])
-if test "x$enable_debug" = xyes; then
-  AC_DEFINE([_DEBUG], [1], [Define to 1 if you want to include debugging code.])
-fi
-
-# Generate output.
-AC_CONFIG_FILES([
-	Makefile
-	doc/Makefile
-	include/GL/Makefile
-	include/Makefile
-	progs/Makefile
-	progs/demos/CallbackMaker/Makefile
-	progs/demos/Fractals/Makefile
-	progs/demos/Fractals_random/Makefile
-	progs/demos/Lorenz/Makefile
-	progs/demos/Makefile
-	progs/demos/One/Makefile
-	progs/demos/shapes/Makefile
-	progs/demos/smooth_opengl3/Makefile
-	progs/demos/spaceball/Makefile
-	progs/demos/subwin/Makefile
-	src/Makefile
-])
-AC_OUTPUT
diff --git a/freeglut/freeglut/doc/Makefile.am b/freeglut/freeglut/doc/Makefile.am
deleted file mode 100644
index 754637b..0000000
--- a/freeglut/freeglut/doc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
-	download.html freeglut.html freeglut_logo.png \
-	freeglut_user_interface.html index.html \
-	ogl_sm.png progress.html structure.html
-
diff --git a/freeglut/freeglut/include/GL/Makefile.am b/freeglut/freeglut/include/GL/Makefile.am
deleted file mode 100644
index ce22c32..0000000
--- a/freeglut/freeglut/include/GL/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libfreeglutincludedir = $(includedir)/GL
-libfreeglutinclude_HEADERS = freeglut.h freeglut_std.h freeglut_ext.h @HEADER@
-EXTRA_HEADERS = glut.h
diff --git a/freeglut/freeglut/include/Makefile.am b/freeglut/freeglut/include/Makefile.am
deleted file mode 100644
index 90f2094..0000000
--- a/freeglut/freeglut/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = GL
diff --git a/freeglut/freeglut/progs/Makefile.am b/freeglut/freeglut/progs/Makefile.am
deleted file mode 100644
index 7cb8ff3..0000000
--- a/freeglut/freeglut/progs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = demos
diff --git a/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am b/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am
deleted file mode 100644
index 18b0699..0000000
--- a/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = CallbackMaker.c CallbackMaker.dsp
-noinst_PROGRAMS = CallbackMaker
-CallbackMaker_SOURCES = CallbackMaker.c
-CallbackMaker_LDFLAGS = -export-dynamic
-CallbackMaker_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-CallbackMaker_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/Fractals/Makefile.am b/freeglut/freeglut/progs/demos/Fractals/Makefile.am
deleted file mode 100644
index 2eef2f3..0000000
--- a/freeglut/freeglut/progs/demos/Fractals/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = Fractals.dsp fractals.c fractals.dat
-noinst_PROGRAMS = fractals
-fractals_SOURCES = fractals.c
-fractals_LDFLAGS = -export-dynamic
-fractals_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-fractals_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am b/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am
deleted file mode 100644
index b881c23..0000000
--- a/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = Fractals_random.dsp fractals.dat fractals_random.c
-noinst_PROGRAMS = fractals_random
-fractals_random_SOURCES = fractals_random.c
-fractals_random_LDFLAGS = -export-dynamic
-fractals_random_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-fractals_random_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/Lorenz/Makefile.am b/freeglut/freeglut/progs/demos/Lorenz/Makefile.am
deleted file mode 100644
index 532184d..0000000
--- a/freeglut/freeglut/progs/demos/Lorenz/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = lorenz.c lorenz.dsp
-noinst_PROGRAMS = lorenz
-lorenz_SOURCES = lorenz.c
-lorenz_LDFLAGS = -export-dynamic
-lorenz_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) -lm
-lorenz_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/Makefile.am b/freeglut/freeglut/progs/demos/Makefile.am
deleted file mode 100644
index 54f6329..0000000
--- a/freeglut/freeglut/progs/demos/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = demos.dsw
-SUBDIRS = CallbackMaker Fractals Fractals_random Lorenz One shapes smooth_opengl3 spaceball subwin
diff --git a/freeglut/freeglut/progs/demos/One/Makefile.am b/freeglut/freeglut/progs/demos/One/Makefile.am
deleted file mode 100644
index d51617d..0000000
--- a/freeglut/freeglut/progs/demos/One/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = one.c one.dsp
-noinst_PROGRAMS = one
-one_SOURCES = one.c
-one_LDFLAGS = -export-dynamic
-one_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-one_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/shapes/Makefile.am b/freeglut/freeglut/progs/demos/shapes/Makefile.am
deleted file mode 100644
index 3560e36..0000000
--- a/freeglut/freeglut/progs/demos/shapes/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = shapes.c shapes.dsp
-noinst_PROGRAMS = shapes
-shapes_SOURCES = shapes.c
-shapes_LDFLAGS = -export-dynamic
-shapes_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-shapes_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am b/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am
deleted file mode 100644
index fcc85d7..0000000
--- a/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = smooth_opengl3.c smooth_opengl3.dsp
-noinst_PROGRAMS = smooth_opengl3
-smooth_opengl3_SOURCES = smooth_opengl3.c
-smooth_opengl3_LDFLAGS = -export-dynamic
-smooth_opengl3_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-smooth_opengl3_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/spaceball/Makefile.am b/freeglut/freeglut/progs/demos/spaceball/Makefile.am
deleted file mode 100644
index 13663fc..0000000
--- a/freeglut/freeglut/progs/demos/spaceball/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = spaceball.c vmath.c vmath.h vmath.inl
-noinst_PROGRAMS = spaceball
-spaceball_SOURCES = spaceball.c vmath.c
-spaceball_LDFLAGS = -export-dynamic
-spaceball_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) -lm
-spaceball_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/progs/demos/subwin/Makefile.am b/freeglut/freeglut/progs/demos/subwin/Makefile.am
deleted file mode 100644
index 03b1e7b..0000000
--- a/freeglut/freeglut/progs/demos/subwin/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = subwin.c subwin.dsp
-noinst_PROGRAMS = subwin
-subwin_SOURCES = subwin.c
-subwin_LDFLAGS = -export-dynamic
-subwin_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS)
-subwin_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
diff --git a/freeglut/freeglut/src/Makefile.am b/freeglut/freeglut/src/Makefile.am
deleted file mode 100644
index 115cda1..0000000
--- a/freeglut/freeglut/src/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-## Process this file with automake to produce Makefile.im
-
-#
-# The library we want to build
-#
-lib_LTLIBRARIES = lib@LIBRARY@.la
-
-#
-# Headers and extra stuff we want to distribute
-#
-noinst_HEADERS = Common/freeglut_internal.h Common/freeglut_teapot_data.h
-
-EXTRA_DIST = Common/freeglutdll.def
-
-#
-# Those source files build the freeglut library
-#
-lib@LIBRARY@_la_SOURCES = \
-	Common/freeglut_callbacks.c \
-	Common/freeglut_cursor.c \
-	Common/freeglut_display.c \
-	Common/freeglut_ext.c \
-	Common/freeglut_font_data.c \
-	Common/freeglut_gamemode.c \
-	Common/freeglut_input_devices.c \
-	Common/freeglut_stroke_roman.c \
-	Common/freeglut_stroke_mono_roman.c \
-	Common/freeglut_init.c \
-	Common/freeglut_spaceball.c \
-	Common/freeglut_joystick.c \
-	Common/freeglut_main.c \
-	Common/freeglut_misc.c \
-	Common/freeglut_overlay.c \
-	Common/freeglut_state.c \
-	Common/freeglut_structure.c \
-	Common/freeglut_videoresize.c \
-	Common/freeglut_window.c
-
-# TODO: uses OpenGL non-ES functions:
-if !TARGET_HOST_ANDROID
-lib@LIBRARY@_la_SOURCES += \
-	Common/freeglut_font.c \
-	Common/freeglut_geometry.c \
-	Common/freeglut_menu.c \
-	Common/freeglut_teapot.c
-endif
-
-if TARGET_HOST_MS_WINDOWS
-lib@LIBRARY@_la_SOURCES += \
-	Common/xparsegeometry_repl.c \
-	Common/xparsegeometry_repl.h \
-	mswin/freeglut_cursor_mswin.c \
-	mswin/freeglut_display_mswin.c \
-	mswin/freeglut_ext_mswin.c \
-	mswin/freeglut_gamemode_mswin.c \
-	mswin/freeglut_init_mswin.c \
-	mswin/freeglut_input_devices_mswin.c \
-	mswin/freeglut_internal_mswin.h \
-	mswin/freeglut_joystick_mswin.c \
-	mswin/freeglut_main_mswin.c \
-	mswin/freeglut_menu_mswin.c \
-	mswin/freeglut_spaceball_mswin.c \
-	mswin/freeglut_state_mswin.c \
-	mswin/freeglut_structure_mswin.c \
-	mswin/freeglut_window_mswin.c
-endif
-
-if TARGET_HOST_POSIX_X11
-lib@LIBRARY@_la_SOURCES += \
-	x11/freeglut_cursor_x11.c \
-	x11/freeglut_display_x11.c \
-	x11/freeglut_ext_x11.c \
-	x11/freeglut_gamemode_x11.c \
-	x11/freeglut_glutfont_definitions_x11.c \
-	x11/freeglut_init_x11.c \
-	x11/freeglut_input_devices_x11.c \
-	x11/freeglut_internal_x11.h \
-	x11/freeglut_joystick_x11.c \
-	x11/freeglut_main_x11.c \
-	x11/freeglut_menu_x11.c \
-	x11/freeglut_spaceball_x11.c \
-	x11/freeglut_state_x11.c \
-	x11/freeglut_structure_x11.c \
-	x11/freeglut_window_x11.c \
-	x11/freeglut_xinput_x11.c
-endif
-
-if TARGET_HOST_ANDROID
-lib@LIBRARY@_la_SOURCES += \
-	Common/xparsegeometry_repl.c \
-	Common/xparsegeometry_repl.h \
-	egl/freeglut_internal_egl.h \
-	egl/freeglut_display_egl.c \
-	egl/freeglut_init_egl.c \
-	egl/freeglut_structure_egl.c \
-	egl/freeglut_window_egl.c \
-	android/native_app_glue/android_native_app_glue.c \
-	android/native_app_glue/android_native_app_glue.h \
-	android/freeglut_runtime_android.c \
-	android/freeglut_gamemode_android.c \
-	android/freeglut_input_devices_android.c \
-	android/freeglut_joystick_android.c \
-	android/freeglut_main_android.c \
-	android/freeglut_spaceball_android.c \
-	android/freeglut_state_android.c \
-	android/freeglut_window_android.c \
-	android/opengles_stubs.c \
-	android/freeglut_internal_android.h
-endif
-
-
-#
-# Additional linker flags
-#	 
-lib@LIBRARY@_la_LIBADD  = $(GL_LIBS) $(X_LIBS) $(LIBM) $(LIBUSBHID)
-lib@LIBRARY@_la_LDFLAGS = $(VERSION_INFO) -no-undefined
-lib@LIBRARY@_la_CFLAGS  = $(GL_FLAGS) $(X_CFLAGS) $(EXPORT_FLAGS)
-lib@LIBRARY@_la_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/src/Common
-
-#
-# End of file
-#