Re: [AD] include path fixup patch.

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


On Sun January 6 2008, Thomas Fjellstrom wrote:
> On Sun January 6 2008, Elias Pschernig wrote:
> > On Sun, 2008-01-06 at 05:50 -0700, Thomas Fjellstrom wrote:
> > > I've got a patch to fix up a ton of references to include/allegro in
> > > 4.9 that are now incorrect.
> > >
> > > Apply if you will, otherwise I can.
> >
> > Does the autotools build work again after applying this?
>
> No, but I'm working on it now, so ignore this patch.

I have found out some interesting things while going along.

For instance the deplib.sh script has been broken for a long time. So the 
dependencies haven't been generated properly in an equally long time.

The idea behind manually doing dependencies the way Allegro's autotools build 
system does is very flawed imo.

Also, with the changes that have been made over the past couple months, theres 
a lot of cruft in the autoconf files. cruft and wrongness. I've managed to 
get it to build a shared release lib, docs and examples, but this is where I 
stop. IMO, it is not worth messing with the current autoconf setup. In my 
mind there are two options, scrap autoconf all together, or write a new set 
that isn't in such a mess*.

I'll volunteer for doing the work for option #1, but someone else is going to 
have to be the one to mess with allegro's autoconf build from now on.


*) Things that need to be looked at are:
1. remove asm
2. remove the unsharable lib if at all possible
3. remove any and all unsupported parts of the unix build (freebeaf?)
4. remove old examples from building
5. remove dga 1 and 2
6. let autoconf handle the dependencies, or at least use a simpler generator 
(gcc -MM anyone?)

Now, I've attached a patch of what I've done to get it to at least build (no 
guarantees about installing or running properly), let me know if theres 
anything horrendously wrong with it.

> --
> Thomas Fjellstrom
> tfjellstrom@xxxxxxxxxx

-- 
Thomas Fjellstrom
tfjellstrom@xxxxxxxxxx
Index: makefile.dmc
===================================================================
--- makefile.dmc	(revision 9797)
+++ makefile.dmc	(working copy)
@@ -205,12 +205,12 @@
 	copy lib\dmc\$(DLL_BASENAME) $(WINDIR_D)
 
 HEADERS = $(DMCDIR_U)/include/winalleg.h                  \
-          $(DMCDIR_U)/include/allegro/platform/aintwin.h  \
-          $(DMCDIR_U)/include/allegro/platform/al386gcc.h \
-          $(DMCDIR_U)/include/allegro/platform/aldmc.h    \
-          $(DMCDIR_U)/include/allegro/platform/alplatf.h  \
-          $(DMCDIR_U)/include/allegro/platform/astdint.h  \
-          $(DMCDIR_U)/include/allegro/platform/alwin.h
+          $(DMCDIR_U)/include/allegro5/platform/aintwin.h  \
+          $(DMCDIR_U)/include/allegro5/platform/al386gcc.h \
+          $(DMCDIR_U)/include/allegro5/platform/aldmc.h    \
+          $(DMCDIR_U)/include/allegro5/platform/alplatf.h  \
+          $(DMCDIR_U)/include/allegro5/platform/astdint.h  \
+          $(DMCDIR_U)/include/allegro5/platform/alwin.h
 
 INSTALL_FILES = $(DMCDIR_U)/lib/$(IMPLIB_BASENAME)
 
Index: cmake/FileList.cmake
===================================================================
--- cmake/FileList.cmake	(revision 9797)
+++ cmake/FileList.cmake	(working copy)
@@ -442,7 +442,7 @@
     )
 
 set(ALLEGRO_INCLUDE_FILES
-    include/allegro5/allegro5.h
+    include/allegro5/allegro.h
     include/allegro5/allegro.h
     include/allegro5/winalleg.h
     include/allegro5/xalleg.h
Index: makefile.vc
===================================================================
--- makefile.vc	(revision 9797)
+++ makefile.vc	(working copy)
@@ -330,13 +330,13 @@
 
 
 HEADERS = $(MSVCDIR_U)/include/winalleg.h                 \
-          $(MSVCDIR_U)/include/allegro/platform/aintwin.h \
-          $(MSVCDIR_U)/include/allegro/platform/al386vc.h \
-          $(MSVCDIR_U)/include/allegro/platform/almsvc.h  \
-          $(MSVCDIR_U)/include/allegro/platform/alplatf.h \
-          $(MSVCDIR_U)/include/allegro/platform/astdbool.h \
-          $(MSVCDIR_U)/include/allegro/platform/astdint.h \
-          $(MSVCDIR_U)/include/allegro/platform/alwin.h
+          $(MSVCDIR_U)/include/allegro5/platform/aintwin.h \
+          $(MSVCDIR_U)/include/allegro5/platform/al386vc.h \
+          $(MSVCDIR_U)/include/allegro5/platform/almsvc.h  \
+          $(MSVCDIR_U)/include/allegro5/platform/alplatf.h \
+          $(MSVCDIR_U)/include/allegro5/platform/astdbool.h \
+          $(MSVCDIR_U)/include/allegro5/platform/astdint.h \
+          $(MSVCDIR_U)/include/allegro5/platform/alwin.h
 
 INSTALL_FILES = $(MSVCDIR_U)/lib/$(IMPLIB_BASENAME)
 
@@ -497,7 +497,7 @@
 obj/msvc/asmdef.inc: obj/msvc/asmdef.exe
 	obj/msvc/asmdef.exe obj/msvc/asmdef.inc
 
-obj/msvc/asmdef.exe: src/i386/asmdef.c include/*.h include/allegro/*.h obj/msvc/asmcapa.h $(RUNNER)
+obj/msvc/asmdef.exe: src/i386/asmdef.c include/*.h include/allegro5/*.h obj/msvc/asmcapa.h $(RUNNER)
 	$(RUNNER) $(MSVC_CL) @ -nologo $(WFLAGS) $(CFLAGS) -I. -I./include -Foobj/msvc/asmdef.obj -Feobj/msvc/asmdef.exe src/i386/asmdef.c
 
 obj/msvc/runner.exe: src/misc/runner.c
Index: demo/include/a5teroids.hpp
===================================================================
--- demo/include/a5teroids.hpp	(revision 9797)
+++ demo/include/a5teroids.hpp	(working copy)
@@ -1,7 +1,7 @@
 #ifndef A5TEROIDS_HPP
 #define A5TEROIDS_HPP
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "a5_font.h"
 
 #ifdef __linux__
Index: scons/osx.scons
===================================================================
--- scons/osx.scons	(revision 9797)
+++ scons/osx.scons	(working copy)
@@ -9,7 +9,7 @@
 
 context.setLibraryDir("lib/macosx")
 
-file = open( "include/allegro/platform/alplatf.h", "w" )
+file = open( "include/allegro5/platform/alplatf.h", "w" )
 file.write( "#define ALLEGRO_MACOSX" )
 file.close()
 
Index: src/xglx/xglx.h
===================================================================
--- src/xglx/xglx.h	(revision 9797)
+++ src/xglx/xglx.h	(working copy)
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
 #include "allegro5/internal/aintern_system.h"
Index: src/mousenu.c
===================================================================
--- src/mousenu.c	(revision 9797)
+++ src/mousenu.c	(working copy)
@@ -21,7 +21,7 @@
 
 #define ALLEGRO_NO_COMPATIBILITY
 
-#include "allegro.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_mouse.h"
 #include "allegro5/internal/aintern_bitmap.h"
Index: src/i386/asmdef.c
===================================================================
--- src/i386/asmdef.c	(revision 9797)
+++ src/i386/asmdef.c	(working copy)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 
 #ifdef ALLEGRO_DOS
Index: src/i386/icpu.c
===================================================================
--- src/i386/icpu.c	(revision 9797)
+++ src/i386/icpu.c	(working copy)
@@ -18,7 +18,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 
 
Index: src/i386/icsprite.c
===================================================================
--- src/i386/icsprite.c	(revision 9797)
+++ src/i386/icsprite.c	(working copy)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "opcodes.h"
 
Index: src/i386/istretch.c
===================================================================
--- src/i386/istretch.c	(revision 9797)
+++ src/i386/istretch.c	(working copy)
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "opcodes.h"
 
Index: src/win/wddraw.h
===================================================================
--- src/win/wddraw.h	(revision 9797)
+++ src/win/wddraw.h	(working copy)
@@ -21,7 +21,7 @@
 
 #define DIRECTDRAW_VERSION 0x0300
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintwin.h"
 
Index: src/linux/lsystem.c
===================================================================
--- src/linux/lsystem.c	(revision 9797)
+++ src/linux/lsystem.c	(working copy)
@@ -35,7 +35,7 @@
 #endif
 #endif
 
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #ifndef ALLEGRO_LINUX
    #error Something is wrong with the makefile
Index: src/linux/lmsems.c
===================================================================
--- src/linux/lmsems.c	(revision 9797)
+++ src/linux/lmsems.c	(working copy)
@@ -27,7 +27,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 
 static int intellimouse;
Index: src/linux/lvgahelp.c
===================================================================
--- src/linux/lvgahelp.c	(revision 9797)
+++ src/linux/lvgahelp.c	(working copy)
@@ -26,7 +26,7 @@
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
 #include "allegro5/internal/aintvga.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #include <string.h>
 #include <stdio.h>
Index: src/linux/lmouse.c
===================================================================
--- src/linux/lmouse.c	(revision 9797)
+++ src/linux/lmouse.c	(working copy)
@@ -24,7 +24,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 
 static int mouse_mx = 0;            /* internal position, in mickeys */
Index: src/linux/lmsegpmd.c
===================================================================
--- src/linux/lmsegpmd.c	(revision 9797)
+++ src/linux/lmsegpmd.c	(working copy)
@@ -26,7 +26,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 
 #define ASCII_NAME "GPM repeater"
Index: src/linux/vtswitch.c
===================================================================
--- src/linux/vtswitch.c	(revision 9797)
+++ src/linux/vtswitch.c	(working copy)
@@ -26,7 +26,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #ifdef ALLEGRO_HAVE_MMAP
 #include <sys/mman.h>
Index: src/linux/lconsole.c
===================================================================
--- src/linux/lconsole.c	(revision 9797)
+++ src/linux/lconsole.c	(working copy)
@@ -22,7 +22,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #include <string.h>
 #include <stdio.h>
Index: src/linux/lasyncio.c
===================================================================
--- src/linux/lasyncio.c	(revision 9797)
+++ src/linux/lasyncio.c	(working copy)
@@ -22,7 +22,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #include <stdio.h>
 #include <unistd.h>
Index: src/linux/lstddrv.c
===================================================================
--- src/linux/lstddrv.c	(revision 9797)
+++ src/linux/lstddrv.c	(working copy)
@@ -24,7 +24,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #include <unistd.h>
 
Index: src/linux/lmseps2.c
===================================================================
--- src/linux/lmseps2.c	(revision 9797)
+++ src/linux/lmseps2.c	(working copy)
@@ -26,7 +26,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 
 static int intellimouse;
Index: src/linux/svgalib.c
===================================================================
--- src/linux/svgalib.c	(revision 9797)
+++ src/linux/svgalib.c	(working copy)
@@ -23,7 +23,7 @@
 #include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 
 #if (defined ALLEGRO_LINUX_SVGALIB) && ((!defined ALLEGRO_WITH_MODULES) || (defined ALLEGRO_MODULE))
Index: src/linux/lmseev.c
===================================================================
--- src/linux/lmseev.c	(revision 9797)
+++ src/linux/lmseev.c	(working copy)
@@ -30,7 +30,7 @@
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_mouse.h"
 #include "allegro5/platform/aintunix.h"
-#include "linalleg.h"
+#include "allegro5/linalleg.h"
 
 #include <stdio.h>
 #include <string.h>
Index: src/pcx.c
===================================================================
--- src/pcx.c	(revision 9797)
+++ src/pcx.c	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 
 
Index: src/allegro.c
===================================================================
--- src/allegro.c	(revision 9797)
+++ src/allegro.c	(working copy)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "allegro5/allegro.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_dtor.h"
 
Index: src/macosx/main.m
===================================================================
--- src/macosx/main.m	(revision 9797)
+++ src/macosx/main.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/soundman.m
===================================================================
--- src/macosx/soundman.m	(revision 9797)
+++ src/macosx/soundman.m	(working copy)
@@ -15,7 +15,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/system.m
===================================================================
--- src/macosx/system.m	(revision 9797)
+++ src/macosx/system.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/camidi.m
===================================================================
--- src/macosx/camidi.m	(revision 9797)
+++ src/macosx/camidi.m	(working copy)
@@ -15,7 +15,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/hidjoy.m
===================================================================
--- src/macosx/hidjoy.m	(revision 9797)
+++ src/macosx/hidjoy.m	(working copy)
@@ -15,7 +15,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_joystick.h"
 #include "allegro5/platform/aintosx.h"
Index: src/macosx/quartz.m
===================================================================
--- src/macosx/quartz.m	(revision 9797)
+++ src/macosx/quartz.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/qtmidi.m
===================================================================
--- src/macosx/qtmidi.m	(revision 9797)
+++ src/macosx/qtmidi.m	(working copy)
@@ -15,7 +15,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/keybd.m
===================================================================
--- src/macosx/keybd.m	(revision 9797)
+++ src/macosx/keybd.m	(working copy)
@@ -18,7 +18,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_events.h"
 #include "allegro5/internal/aintern_keyboard.h"
Index: src/macosx/hidman.m
===================================================================
--- src/macosx/hidman.m	(revision 9797)
+++ src/macosx/hidman.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/qzmouse.m
===================================================================
--- src/macosx/qzmouse.m	(revision 9797)
+++ src/macosx/qzmouse.m	(working copy)
@@ -18,7 +18,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_mouse.h"
 #include "allegro5/platform/aintosx.h"
Index: src/macosx/pcpu.m
===================================================================
--- src/macosx/pcpu.m	(revision 9797)
+++ src/macosx/pcpu.m	(working copy)
@@ -12,7 +12,7 @@
  *
  *      See readme.txt for copyright information.
  */
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 
 #ifndef SCAN_DEPEND
Index: src/macosx/qzfull.m
===================================================================
--- src/macosx/qzfull.m	(revision 9797)
+++ src/macosx/qzfull.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/drivers.m
===================================================================
--- src/macosx/drivers.m	(revision 9797)
+++ src/macosx/drivers.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_joystick.h"
 #include "allegro5/platform/aintosx.h"
Index: src/macosx/cadigi.m
===================================================================
--- src/macosx/cadigi.m	(revision 9797)
+++ src/macosx/cadigi.m	(working copy)
@@ -15,7 +15,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/macosx/qzwindow.m
===================================================================
--- src/macosx/qzwindow.m	(revision 9797)
+++ src/macosx/qzwindow.m	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 
Index: src/x/xwin.h
===================================================================
--- src/x/xwin.h	(revision 9797)
+++ src/x/xwin.h	(working copy)
@@ -18,7 +18,7 @@
 #ifndef __bma_xwin_h
 #define __bma_xwin_h
 
-#include "xalleg.h"
+#include "allegro5/xalleg.h"
 
 /* Defined in xmouse.c */
 AL_VAR(int, _xwin_mouse_extended_range);
Index: docs/src/build/unix._tx
===================================================================
--- docs/src/build/unix._tx	(revision 9797)
+++ docs/src/build/unix._tx	(working copy)
@@ -331,15 +331,15 @@
    If the Irix compiler spits strange lines such as the following when
    compiling your Allegro program:
 <textblock>
-      include/allegro/alcompat.h:59: conflicting types for `ceilf'
+      include/allegro5/alcompat.h:59: conflicting types for `ceilf'
       /usr/include/math.h:311: previous declaration of `ceilf'
-      include/allegro/alcompat.h:60: conflicting types for `floorf'
+      include/allegro5/alcompat.h:60: conflicting types for `floorf'
       /usr/include/math.h:333: previous declaration of `floorf'
-      include/allegro/alcompat.h:63: conflicting types for `tanf'
+      include/allegro5/alcompat.h:63: conflicting types for `tanf'
       /usr/include/math.h:176: previous declaration of `tanf'
-      include/allegro/alcompat.h:64: conflicting types for `acosf'
+      include/allegro5/alcompat.h:64: conflicting types for `acosf'
       /usr/include/math.h:106: previous declaration of `acosf'
-      include/allegro/alcompat.h:65: conflicting types for `asinf'
+      include/allegro5/alcompat.h:65: conflicting types for `asinf'
       /usr/include/math.h:116: previous declaration of `asinf'
 <endblock>
    then you should <tt>#define ALLEGRO_NO_FIX_ALIASES</tt> prior to
Index: docs/src/ahack._tx
===================================================================
--- docs/src/ahack._tx	(revision 9797)
+++ docs/src/ahack._tx	(working copy)
@@ -189,11 +189,11 @@
 Header Files
 
 allegro.h lives in the include/ directory. It is only a placeholder which
-includes other headers which live in the include/allegro/ tree. The reason
+includes other headers which live in the include/allegro5/ tree. The reason
 for this slightly odd approach is that allegro.h can include things like
 "allegro/keyboard.h", which will work both in-situ within the build
 directory, and if we copy allegro.h to the system include directory and the
-other headers into system_include/allegro/. This avoids cluttering the
+other headers into system_include/allegro5/. This avoids cluttering the
 system directories with lots of our headers, while still allowing programs
 to just #include &ltallegro.h&gt, and also makes it possible for people to
 access keyboard stuff with #include &ltallegro/keyboard.h&gt.
@@ -211,7 +211,7 @@
 
 Every module-specific header contains structure definitions and function
 prototypes. At the end of the file, it may include a header from the
-include/allegro/inline/ directory which defines related inline routines.
+include/allegro5/inline/ directory which defines related inline routines.
 If inline asm is supported, this can include in turn asm.inl which imports
 routines from one of the compiler-specific files al386gcc.h, al386vc.h and
 al386wat.h; otherwise C versions are used instead. The header alinline.h
Index: docs/src/changes._tx
===================================================================
--- docs/src/changes._tx	(revision 9797)
+++ docs/src/changes._tx	(working copy)
@@ -299,7 +299,7 @@
    Trent Gamblin renamed scroll_display to scroll_screen in display.c
 <li>
    Trent Gamblin Removed commented code from src/display.c. Removed
-   include/allegro/display.h and src/compat/cogfx.c
+   include/allegro5/display.h and src/compat/cogfx.c
 <li>
    Elias Pschernig renamed XDUMMY driver to XGLX.
 <li>
@@ -3438,7 +3438,7 @@
    for MinGW32 consistent with other Windows ports.
 <li>
    3.9.40: Henrik Stokseth improved make install to install only the needed
-   headers from the include/allegro/platform directory.
+   headers from the include/allegro5/platform directory.
 <li>
    3.9.40: Vincent Penquerc'h updated 7 makefiles after his header splitting
    patch.
Index: docs/src/allegro._tx
===================================================================
--- docs/src/allegro._tx	(revision 9797)
+++ docs/src/allegro._tx	(working copy)
@@ -474,7 +474,7 @@
 @xref check_cpu, cpu_vendor, cpu_family, cpu_capabilities, allegro_init
 @shortdesc Contains the Intel CPU submodel.
    Contains the CPU submodel, where applicable. Allegro defines at least the 
-   following CPU family types (see include/allegro/system.h for a more 
+   following CPU family types (see include/allegro5/system.h for a more 
    complete list):
 <textblock>
       CPU_FAMILY_I586:
@@ -13559,7 +13559,7 @@
 to learn more about this.
 
 A Windows program that uses the Allegro library is only required to include
-one or more header files from the include/allegro tree, or allegro.h; however,
+one or more header files from the include/allegro5 tree, or allegro5.h; however,
 if it also needs to directly call non portable Win32 API functions, it must
 include the Windows-specific header file winalleg.h after the Allegro headers,
 and before any Win32 API header file. By default winalleg.h includes the main
@@ -14751,7 +14751,7 @@
 all quite minor variations on the basic code.
 <li>
 If you are _really_ serious about this size, thing, have a look at the top 
-of include/allegro/alconfig.h and you will see the lines:
+of include/allegro5/alconfig.h and you will see the lines:
 <codeblock>
    #define ALLEGRO_COLOR8
    #define ALLEGRO_COLOR16
Index: tools/pat2dat.c
===================================================================
--- tools/pat2dat.c	(revision 9797)
+++ tools/pat2dat.c	(working copy)
@@ -25,8 +25,8 @@
 #include <time.h>
 #include <math.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "datedit.h"
 
 
Index: tools/plugins/datfont.c
===================================================================
--- tools/plugins/datfont.c	(revision 9797)
+++ tools/plugins/datfont.c	(working copy)
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datworms.c
===================================================================
--- tools/plugins/datworms.c	(revision 9797)
+++ tools/plugins/datworms.c	(working copy)
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datfli.c
===================================================================
--- tools/plugins/datfli.c	(revision 9797)
+++ tools/plugins/datfli.c	(working copy)
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datgrab.c
===================================================================
--- tools/plugins/datgrab.c	(revision 9797)
+++ tools/plugins/datgrab.c	(working copy)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datpal.c
===================================================================
--- tools/plugins/datpal.c	(revision 9797)
+++ tools/plugins/datpal.c	(working copy)
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datimage.c
===================================================================
--- tools/plugins/datimage.c	(revision 9797)
+++ tools/plugins/datimage.c	(working copy)
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datmidi.c
===================================================================
--- tools/plugins/datmidi.c	(revision 9797)
+++ tools/plugins/datmidi.c	(working copy)
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datgrid.c
===================================================================
--- tools/plugins/datgrid.c	(revision 9797)
+++ tools/plugins/datgrid.c	(working copy)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datalpha.c
===================================================================
--- tools/plugins/datalpha.c	(revision 9797)
+++ tools/plugins/datalpha.c	(working copy)
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datfname.c
===================================================================
--- tools/plugins/datfname.c	(revision 9797)
+++ tools/plugins/datfname.c	(working copy)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datitype.c
===================================================================
--- tools/plugins/datitype.c	(revision 9797)
+++ tools/plugins/datitype.c	(working copy)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "../datedit.h"
 
 
Index: tools/plugins/datsamp.c
===================================================================
--- tools/plugins/datsamp.c	(revision 9797)
+++ tools/plugins/datsamp.c	(working copy)
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "../datedit.h"
 
 
Index: tools/grabber.c
===================================================================
--- tools/grabber.c	(revision 9797)
+++ tools/grabber.c	(working copy)
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "datedit.h"
 
 #if (defined ALLEGRO_DJGPP) && (!defined SCAN_DEPEND)
Index: tools/rgbmap.c
===================================================================
--- tools/rgbmap.c	(revision 9797)
+++ tools/rgbmap.c	(working copy)
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tools/dat.c
===================================================================
--- tools/dat.c	(revision 9797)
+++ tools/dat.c	(working copy)
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "datedit.h"
 
 #if ((defined ALLEGRO_DOS) || (defined ALLEGRO_WINDOWS)) && (!defined SCAN_DEPEND)
Index: tools/textconv.c
===================================================================
--- tools/textconv.c	(revision 9797)
+++ tools/textconv.c	(working copy)
@@ -20,8 +20,8 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 
 
Index: tools/exedat.c
===================================================================
--- tools/exedat.c	(revision 9797)
+++ tools/exedat.c	(working copy)
@@ -22,8 +22,8 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 #ifdef ALLEGRO_UNIX
 #include <sys/stat.h>
Index: tools/colormap.c
===================================================================
--- tools/colormap.c	(revision 9797)
+++ tools/colormap.c	(working copy)
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tools/dat2s.c
===================================================================
--- tools/dat2s.c	(revision 9797)
+++ tools/dat2s.c	(working copy)
@@ -22,8 +22,8 @@
 #include <string.h>
 #include <time.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "datedit.h"
 
 
Index: tools/pack.c
===================================================================
--- tools/pack.c	(revision 9797)
+++ tools/pack.c	(working copy)
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tools/datedit.c
===================================================================
--- tools/datedit.c	(revision 9797)
+++ tools/datedit.c	(working copy)
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <time.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 #include "datedit.h"
 
 
Index: tools/x11/xf2pcx.c
===================================================================
--- tools/x11/xf2pcx.c	(revision 9797)
+++ tools/x11/xf2pcx.c	(working copy)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 #ifndef SCAN_DEPEND
    #include <X11/Xlib.h>
Index: tools/dat2c.c
===================================================================
--- tools/dat2c.c	(revision 9797)
+++ tools/dat2c.c	(working copy)
@@ -46,8 +46,8 @@
 
 /* Allegro includes */
 #define ALLEGRO_USE_CONSOLE
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 
 
@@ -1006,7 +1006,7 @@
 	  " */$n$"
 	  "$n$"
 	  "#ifndef ALLEGRO_H$n$"
-	  "#error You must include allegro5.h$n$"
+	  "#error You must include allegro5/allegro5.h$n$"
 	  "#endif$n$"
 	  "$n$"
 	  "#ifndef $string$$n$"
@@ -1055,8 +1055,8 @@
 	  " *  Do not hand edit.$n$"
 	  " */$n$"
 	  "$n$"
-	  "#include <allegro5.h>$n$"
-	  "#include <allegro/internal/aintern.h>$n$"
+	  "#include <allegro5/allegro5.h>$n$"
+	  "#include <allegro5/internal/aintern.h>$n$"
 	  "$n$$n$$n$", dat2c->fname_c, dat2c->fname_dat);
 }
 
Index: tests/gfxinfo.c
===================================================================
--- tests/gfxinfo.c	(revision 9797)
+++ tests/gfxinfo.c	(working copy)
@@ -19,8 +19,8 @@
 #define ALLEGRO_USE_CONSOLE
 #include <string.h>
 #include <stdio.h>
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 
 
Index: tests/playfli.c
===================================================================
--- tests/playfli.c	(revision 9797)
+++ tests/playfli.c	(working copy)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tests/afinfo.c
===================================================================
--- tests/afinfo.c	(revision 9797)
+++ tests/afinfo.c	(working copy)
@@ -19,13 +19,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 /* this program is not portable! */
 #if (defined ALLEGRO_DOS) || (defined ALLEGRO_LINUX_VBEAF)
 
-#include "allegro/internal/aintern.h"
+#include "allegro5/internal/aintern.h"
 
 #ifdef ALLEGRO_INTERNAL_HEADER
    #include ALLEGRO_INTERNAL_HEADER
Index: tests/akaitest.c
===================================================================
--- tests/akaitest.c	(revision 9797)
+++ tests/akaitest.c	(working copy)
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tests/play.c
===================================================================
--- tests/play.c	(revision 9797)
+++ tests/play.c	(working copy)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tests/vesainfo.c
===================================================================
--- tests/vesainfo.c	(revision 9797)
+++ tests/vesainfo.c	(working copy)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 /* this program is not portable! */
Index: tests/win/dibhello.c
===================================================================
--- tests/win/dibhello.c	(revision 9797)
+++ tests/win/dibhello.c	(working copy)
@@ -19,7 +19,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "winalleg.h"
 
 
Index: tests/win/dxwindow.c
===================================================================
--- tests/win/dxwindow.c	(revision 9797)
+++ tests/win/dxwindow.c	(working copy)
@@ -18,7 +18,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "winalleg.h"
 #include "dxwindow.rh"
 #include "examples/running.h"
Index: tests/win/scrsave.c
===================================================================
--- tests/win/scrsave.c	(revision 9797)
+++ tests/win/scrsave.c	(working copy)
@@ -32,7 +32,7 @@
 
 #include <time.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "winalleg.h"
 #include "scrsave.rh"
 
Index: tests/win/dibsound.c
===================================================================
--- tests/win/dibsound.c	(revision 9797)
+++ tests/win/dibsound.c	(working copy)
@@ -18,7 +18,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "winalleg.h"
 #include "dibsound.rh" 
 
Index: tests/win/dibgrab.c
===================================================================
--- tests/win/dibgrab.c	(revision 9797)
+++ tests/win/dibgrab.c	(working copy)
@@ -17,7 +17,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "winalleg.h"
 
 
Index: tests/digitest.c
===================================================================
--- tests/digitest.c	(revision 9797)
+++ tests/digitest.c	(working copy)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tests/filetest.c
===================================================================
--- tests/filetest.c	(revision 9797)
+++ tests/filetest.c	(working copy)
@@ -24,8 +24,8 @@
 
 #include <time.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 
 #define FLIST_SIZE      2048
Index: tests/test.c
===================================================================
--- tests/test.c	(revision 9797)
+++ tests/test.c	(working copy)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tests/cpptest.cpp
===================================================================
--- tests/cpptest.cpp	(revision 9797)
+++ tests/cpptest.cpp	(working copy)
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include "allegro5.h"
+#include "allegro5/allegro.h"
 
 #define RODENTS  4
 
Index: tests/miditest.c
===================================================================
--- tests/miditest.c	(revision 9797)
+++ tests/miditest.c	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: tests/mathtest.c
===================================================================
--- tests/mathtest.c	(revision 9797)
+++ tests/mathtest.c	(working copy)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 
 
Index: makefile.mgw
===================================================================
--- makefile.mgw	(revision 9797)
+++ makefile.mgw	(working copy)
@@ -270,13 +270,13 @@
 
 
 HEADERS = $(MINGDIR_U)/include/winalleg.h                  \
-          $(MINGDIR_U)/include/allegro/platform/aintwin.h  \
-          $(MINGDIR_U)/include/allegro/platform/al386gcc.h \
-          $(MINGDIR_U)/include/allegro/platform/almngw32.h \
-          $(MINGDIR_U)/include/allegro/platform/alplatf.h  \
-          $(MINGDIR_U)/include/allegro/platform/astdbool.h \
-          $(MINGDIR_U)/include/allegro/platform/astdint.h  \
-          $(MINGDIR_U)/include/allegro/platform/alwin.h
+          $(MINGDIR_U)/include/allegro5/platform/aintwin.h  \
+          $(MINGDIR_U)/include/allegro5/platform/al386gcc.h \
+          $(MINGDIR_U)/include/allegro5/platform/almngw32.h \
+          $(MINGDIR_U)/include/allegro5/platform/alplatf.h  \
+          $(MINGDIR_U)/include/allegro5/platform/astdbool.h \
+          $(MINGDIR_U)/include/allegro5/platform/astdint.h  \
+          $(MINGDIR_U)/include/allegro5/platform/alwin.h
 
 INSTALL_FILES = $(MINGDIR_U)/lib/$(IMPLIB_BASENAME)
 
@@ -462,7 +462,7 @@
 
 ifdef CROSSCOMPILE
 
-obj/mingw32/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h obj/mingw32/asmcapa.h
+obj/mingw32/asmdef.s: src/i386/asmdef.c include/*.h include/allegro5/*.h obj/mingw32/asmcapa.h
 	$(CC) $(WFLAGS) -I. -I./include -S -o obj/mingw32/asmdef.s src/i386/asmdef.c
 
 obj/mingw32/asmdef.inc: obj/mingw32/asmdef.s
Index: addons/font/readfont.c
===================================================================
--- addons/font/readfont.c	(revision 9797)
+++ addons/font/readfont.c	(working copy)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 
 #include "a5_font.h"
Index: addons/font/text.c
===================================================================
--- addons/font/text.c	(revision 9797)
+++ addons/font/text.c	(working copy)
@@ -20,7 +20,7 @@
  */
 
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 
 
Index: addons/font/fontbmp.c
===================================================================
--- addons/font/fontbmp.c	(revision 9797)
+++ addons/font/fontbmp.c	(working copy)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_bitmap.h"
 
Index: addons/font/font.c
===================================================================
--- addons/font/font.c	(revision 9797)
+++ addons/font/font.c	(working copy)
@@ -23,7 +23,7 @@
  */
 
 #include <string.h>
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_bitmap.h"
 
Index: addons/font/ex.c
===================================================================
--- addons/font/ex.c	(revision 9797)
+++ addons/font/ex.c	(working copy)
@@ -1,4 +1,4 @@
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 #include "a5_font.h"
 
 int main(void)
Index: makefile.lst
===================================================================
--- makefile.lst	(revision 9797)
+++ makefile.lst	(working copy)
@@ -3,6 +3,8 @@
 ALLEGRO_SRC_FILES = \
 	src/allegro.c \
 	src/blit.c \
+	src/blenders.c \
+	src/bitmap_new.c \
 	src/bmp.c \
 	src/clip3d.c \
 	src/clip3df.c \
@@ -14,7 +16,8 @@
 	src/digmid.c \
 	src/dither.c \
 	src/dispsw.c \
-        src/display.c \
+	src/display.c \
+	src/display_new.c \
 	src/dtor.c \
 	src/drvlist.c \
 	src/events.c \
@@ -49,6 +52,7 @@
 	src/modesel.c \
 	src/mousenu.c \
 	src/pcx.c \
+	src/pixels.c \
 	src/poly3d.c \
 	src/polygon.c \
 	src/quantize.c \
@@ -76,7 +80,14 @@
 	src/compat/cokeybd.c \
 	src/compat/comouse.c \
 	src/compat/cotimer.c \
-	src/misc/vector.c
+	src/misc/vector.c \
+	src/memblit1.c \
+	src/memblit.c \
+	src/memblit2.c \
+	src/memdraw.c \
+	src/system_new.c \
+	src/memblit3.c \
+	src/convert.c
 
 ALLEGRO_SRC_C_FILES = \
 	src/c/cblit16.c \
@@ -350,6 +361,15 @@
 	src/x/xdga2s.s \
 	src/x/xwins.s \
 	src/misc/colconv.c
+
+ALLEGRO_SRC_XGLX_FILES = \
+	src/xglx/xbitmap.c \
+	src/xglx/xcompat.c \
+	src/xglx/xdisplay.c \
+	src/xglx/xdraw.c \
+	src/xglx/xfullscreen.c \
+	src/xglx/xglx_config.c \
+	src/xglx/xsystem.c
 	
 ALLEGRO_SRC_QNX_FILES = \
 	src/qnx/qdrivers.c \
@@ -545,7 +565,6 @@
 	examples/exmem.c \
 	examples/exmidi.c \
 	examples/exmouse.c \
-	examples/exnew_events.c \
 	examples/expackf.c \
 	examples/expal.c \
 	examples/expat.c \
@@ -568,7 +587,16 @@
 	examples/exunicod.c \
 	examples/exupdate.c \
 	examples/exxfade.c \
-	examples/exzbuf.c
+	examples/exzbuf.c \
+	examples/exnewapi.c \
+	examples/exnew_bitmap.c \
+	examples/exnew_fs_resize.c \
+	examples/exnew_icon.c \
+	examples/exnew_lockbitmap.c \
+	examples/exnew_lockscreen.c \
+	examples/exnew_mouse.c \
+	examples/exnew_mouse_events.c \
+	examples/exnew_resize.c
 
 ALLEGRO_EXAMPLE_EXES = \
 	examples/ex12bit \
@@ -597,7 +625,6 @@
 	examples/exmem \
 	examples/exmidi \
 	examples/exmouse \
-	examples/exnew_events \
 	examples/expackf \
 	examples/expal \
 	examples/expat \
@@ -620,7 +647,16 @@
 	examples/exunicod \
 	examples/exupdate \
 	examples/exxfade \
-	examples/exzbuf
+	examples/exzbuf \
+   examples/exnewapi \
+   examples/exnew_bitmap \
+   examples/exnew_fs_resize \
+   examples/exnew_icon \
+   examples/exnew_lockbitmap \
+   examples/exnew_lockscreen \
+   examples/exnew_mouse \
+   examples/exnew_mouse_events \
+   examples/exnew_resize
 
 OBJ_CLEAN_FILES = \
 	obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o obj/*/*.obj obj/*/*/*.obj
@@ -653,7 +689,7 @@
 	$(ALLEGRO_LIB_EXES) $(ALLEGRO_EXAMPLE_EXES) $(ALLEGRO_DATAFILE_EXES) \
 	*.exe */*.exe */*/*.exe msvcmake.bat tests/win/*.scr \
 	config.cache config.log config.status stamp-h stamp-h[0-9]* suid \
-	makefile.dep makefile.info include/allegro/platform/alunixac.h allegro-config
+	makefile.dep makefile.info include/allegro5/platform/alunixac.h allegro-config
 
 VERYCLEAN_FILES = \
 	authors AUTHORS changes CHANGES thanks THANKS readme.txt \
Index: makefile.in
===================================================================
--- makefile.in	(revision 9797)
+++ makefile.in	(working copy)
@@ -50,8 +50,8 @@
 
 mkinstalldirs = $(SHELL) $(srcdir)/misc/mkdirs.sh
 
-CONFIG_H = include/allegro/platform/alunixac.h
-CONFIG_H_IN = include/allegro/platform/alunixac.hin
+CONFIG_H = include/allegro5/platform/alunixac.h
+CONFIG_H_IN = include/allegro5/platform/alunixac.hin
 CONFIGURE = configure
 CONFIGURE_IN = configure.in
 ACLOCAL_M4 = aclocal.m4
@@ -137,6 +137,7 @@
 	$(ALLEGRO_SRC_UNIX_FILES) \
 	$(@ALLEGRO_MAYBE_ASM_FILES@) \
 	$(@ALLEGRO_MAYBE_XWINDOWS_FILES@) \
+	$(@ALLEGRO_MAYBE_XGLX_FILES@) \
 	$(@ALLEGRO_MAYBE_LINUX_FILES@)
 
 ALLEGRO_EXE_TARGETS = \
@@ -147,76 +148,76 @@
 	demo/demo
 
 # Header files (look in makefile.dep for "Headers referred by symbols").
-ALLEGRO_EXTRA_HEADER = $(srcdir)/include/allegro/platform/alunix.h
-ALLEGRO_INTERNAL_HEADER = $(srcdir)/include/allegro/platform/aintunix.h
+ALLEGRO_EXTRA_HEADER = $(srcdir)/include/allegro5/platform/alunix.h
+ALLEGRO_INTERNAL_HEADER = $(srcdir)/include/allegro5/platform/aintunix.h
 ALLEGRO_MMX_HEADER =
-allegro_alconfig_h = $(srcdir)/include/allegro/internal/alconfig.h \
-	$(srcdir)/include/allegro/platform/alucfg.h \
+allegro_alconfig_h = $(srcdir)/include/allegro5/internal/alconfig.h \
+	$(srcdir)/include/allegro5/platform/alucfg.h \
 	$(CONFIG_H)
-allegro_alinline_h = $(srcdir)/include/allegro/alinline.h \
-	$(srcdir)/include/allegro/platform/al386gcc.h \
-	$(srcdir)/include/allegro/platform/al386vc.h \
-	$(srcdir)/include/allegro/platform/al386wat.h
-allegro_h = $(srcdir)/include/allegro.h \
+allegro_alinline_h = $(srcdir)/include/allegro5/alinline.h \
+	$(srcdir)/include/allegro5/platform/al386gcc.h \
+	$(srcdir)/include/allegro5/platform/al386vc.h \
+	$(srcdir)/include/allegro5/platform/al386wat.h
+allegro_h = $(srcdir)/include/allegro5/allegro.h \
 	$(allegro_alconfig_h) \
 	$(allegro_alinline_h) \
-	$(srcdir)/include/allegro/3d.h \
-	$(srcdir)/include/allegro/3dmaths.h \
-	$(srcdir)/include/allegro/alcompat.h \
-	$(srcdir)/include/allegro/alinline.h \
-	$(srcdir)/include/allegro/base.h \
-	$(srcdir)/include/allegro/color.h \
-	$(srcdir)/include/allegro/compiled.h \
-	$(srcdir)/include/allegro/config.h \
-	$(srcdir)/include/allegro/datafile.h \
-	$(srcdir)/include/allegro/debug.h \
-	$(srcdir)/include/allegro/digi.h \
-	$(srcdir)/include/allegro/draw.h \
-	$(srcdir)/include/allegro/file.h \
-	$(srcdir)/include/allegro/fix.h \
-	$(srcdir)/include/allegro/fixed.h \
-	$(srcdir)/include/allegro/fli.h \
-	$(srcdir)/include/allegro/fmaths.h \
-	$(srcdir)/include/allegro/gfx.h \
-	$(srcdir)/include/allegro/gui.h \
-	$(srcdir)/include/allegro/joystick.h \
-	$(srcdir)/include/allegro/keyboard.h \
-	$(srcdir)/include/allegro/matrix.h \
-	$(srcdir)/include/allegro/midi.h \
-	$(srcdir)/include/allegro/mouse.h \
-	$(srcdir)/include/allegro/palette.h \
-	$(srcdir)/include/allegro/quat.h \
-	$(srcdir)/include/allegro/rle.h \
-	$(srcdir)/include/allegro/sound.h \
-	$(srcdir)/include/allegro/stream.h \
-	$(srcdir)/include/allegro/system.h \
-	$(srcdir)/include/allegro/text.h \
-	$(srcdir)/include/allegro/timer.h \
-	$(srcdir)/include/allegro/unicode.h \
-	$(srcdir)/include/allegro/graphics.h \
-	$(srcdir)/include/allegro/inline/3dmaths.inl \
-	$(srcdir)/include/allegro/inline/asm.inl \
-	$(srcdir)/include/allegro/inline/color.inl \
-	$(srcdir)/include/allegro/inline/draw.inl \
-	$(srcdir)/include/allegro/inline/fix.inl \
-	$(srcdir)/include/allegro/inline/fmaths.inl \
-	$(srcdir)/include/allegro/inline/gfx.inl \
-	$(srcdir)/include/allegro/inline/matrix.inl \
-	$(srcdir)/include/allegro/inline/rle.inl \
-	$(srcdir)/include/allegro/inline/system.inl \
+	$(srcdir)/include/allegro5/3d.h \
+	$(srcdir)/include/allegro5/3dmaths.h \
+	$(srcdir)/include/allegro5/alcompat.h \
+	$(srcdir)/include/allegro5/alinline.h \
+	$(srcdir)/include/allegro5/base.h \
+	$(srcdir)/include/allegro5/color.h \
+	$(srcdir)/include/allegro5/compiled.h \
+	$(srcdir)/include/allegro5/config.h \
+	$(srcdir)/include/allegro5/datafile.h \
+	$(srcdir)/include/allegro5/debug.h \
+	$(srcdir)/include/allegro5/digi.h \
+	$(srcdir)/include/allegro5/draw.h \
+	$(srcdir)/include/allegro5/file.h \
+	$(srcdir)/include/allegro5/fix.h \
+	$(srcdir)/include/allegro5/fixed.h \
+	$(srcdir)/include/allegro5/fli.h \
+	$(srcdir)/include/allegro5/fmaths.h \
+	$(srcdir)/include/allegro5/gfx.h \
+	$(srcdir)/include/allegro5/gui.h \
+	$(srcdir)/include/allegro5/joystick.h \
+	$(srcdir)/include/allegro5/keyboard.h \
+	$(srcdir)/include/allegro5/matrix.h \
+	$(srcdir)/include/allegro5/midi.h \
+	$(srcdir)/include/allegro5/mouse.h \
+	$(srcdir)/include/allegro5/palette.h \
+	$(srcdir)/include/allegro5/quat.h \
+	$(srcdir)/include/allegro5/rle.h \
+	$(srcdir)/include/allegro5/sound.h \
+	$(srcdir)/include/allegro5/stream.h \
+	$(srcdir)/include/allegro5/system.h \
+	$(srcdir)/include/allegro5/text.h \
+	$(srcdir)/include/allegro5/timer.h \
+	$(srcdir)/include/allegro5/unicode.h \
+	$(srcdir)/include/allegro5/graphics.h \
+	$(srcdir)/include/allegro5/inline/3dmaths.inl \
+	$(srcdir)/include/allegro5/inline/asm.inl \
+	$(srcdir)/include/allegro5/inline/color.inl \
+	$(srcdir)/include/allegro5/inline/draw.inl \
+	$(srcdir)/include/allegro5/inline/fix.inl \
+	$(srcdir)/include/allegro5/inline/fmaths.inl \
+	$(srcdir)/include/allegro5/inline/gfx.inl \
+	$(srcdir)/include/allegro5/inline/matrix.inl \
+	$(srcdir)/include/allegro5/inline/rle.inl \
+	$(srcdir)/include/allegro5/inline/system.inl \
 	$(ALLEGRO_EXTRA_HEADER)
-allegro_internal_aintern_h = $(srcdir)/include/allegro/internal/aintern.h
-allegro_aintdos_h = $(srcdir)/include/allegro/platform/aintdos.h \
-	$(srcdir)/include/allegro/internal/aintvga.h
+allegro_internal_aintern_h = $(srcdir)/include/allegro5/internal/aintern.h
+allegro_aintdos_h = $(srcdir)/include/allegro5/platform/aintdos.h \
+	$(srcdir)/include/allegro5/internal/aintvga.h
 obj_unix_asmdef_inc = $(OBJDIR)/asmdef.inc
-xalleg_h = $(srcdir)/include/xalleg.h
+xalleg_h = $(srcdir)/include/allegro5/xalleg.h
 
 # required to get asmdef.inc to be built automatically
 $(ALLEGRO_SRC_I386_FILES): $(obj_unix_asmdef_inc)
 
 ifdef CROSSCOMPILE
 
-$(OBJDIR)/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h
+$(OBJDIR)/asmdef.s: src/i386/asmdef.c include/allegro5/*.h
 	$(CC) $(INCLUDES) `echo $(CFLAGS) | sed -e "s/.*\(-DALLEGRO_NO_ASM\).*/\1/"` -S -o $(OBJDIR)/asmdef.s src/i386/asmdef.c
 
 $(obj_unix_asmdef_inc): $(OBJDIR)/asmdef.s
@@ -442,7 +443,7 @@
 	rm -f makefile
 
 maintainer-clean: veryclean
-	rm -f configure include/allegro/platform/alunixac.hin
+	rm -f configure include/allegro5/platform/alunixac.hin
 	rm -rf autom4te*
 
 
@@ -510,29 +511,29 @@
 	@$(INSTALL_DATA) misc/allegro.m4 $(DESTDIR)$(prefix)/share/aclocal
 
 install-headers:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro/inline
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro/internal
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro/platform
-	$(INSTALL_DATA) $(srcdir)/include/allegro.h $(DESTDIR)$(includedir)/
-	$(INSTALL_DATA) $(srcdir)/include/xalleg.h $(DESTDIR)$(includedir)/
-	$(INSTALL_DATA) $(srcdir)/include/linalleg.h $(DESTDIR)$(includedir)/
-	$(INSTALL_DATA) $(CONFIG_H) $(DESTDIR)$(includedir)/allegro/
-	@for file in $(srcdir)/include/allegro/*.h; do \
-	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/; \
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro5
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro5/inline
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro5/internal
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/allegro5/platform
+	$(INSTALL_DATA) $(srcdir)/include/allegro5/allegro.h $(DESTDIR)$(includedir)/
+	$(INSTALL_DATA) $(srcdir)/include/allegro5/xalleg.h $(DESTDIR)$(includedir)/
+	$(INSTALL_DATA) $(srcdir)/include/allegro5/linalleg.h $(DESTDIR)$(includedir)/
+	$(INSTALL_DATA) $(CONFIG_H) $(DESTDIR)$(includedir)/allegro5/
+	@for file in $(srcdir)/include/allegro5/*.h; do \
+	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro5; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro5/; \
 	done
-	@for file in $(srcdir)/include/allegro/inline/*.inl; do \
-	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro/inline; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/inline/; \
+	@for file in $(srcdir)/include/allegro5/inline/*.inl; do \
+	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro5/inline; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro5/inline/; \
 	done
-	@for file in $(srcdir)/include/allegro/internal/*.h; do \
-	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro/internal; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/internal/; \
+	@for file in $(srcdir)/include/allegro5/internal/*.h; do \
+	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro5/internal; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro5/internal/; \
 	done
-	@for file in $(srcdir)/include/allegro/platform/*.h; do \
-	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro/platform; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro/platform/; \
+	@for file in $(srcdir)/include/allegro5/platform/*.h; do \
+	  echo Installing $$file to $(DESTDIR)$(includedir)/allegro5/platform; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro5/platform/; \
 	done
 
 INSTALL_EXES = $(filter tools/%, $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES))
@@ -620,10 +621,7 @@
 	rm -rf $(modulebasedir) $(moduledir)
 
 uninstall-headers:
-	rm -f $(includedir)/allegro.h
-	rm -f $(includedir)/xalleg.h
-	rm -f $(includedir)/linalleg.h
-	rm -rf $(includedir)/allegro
+	rm -rf $(includedir)/allegro5
 
 uninstall-programs:
 	@for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
Index: include/allegro5/platform/alunixac.hin
===================================================================
--- include/allegro5/platform/alunixac.hin	(revision 9797)
+++ include/allegro5/platform/alunixac.hin	(working copy)
@@ -28,6 +28,7 @@
 #undef ALLEGRO_HAVE_SYS_STAT_H
 #undef ALLEGRO_HAVE_SYS_TIME_H
 #undef ALLEGRO_HAVE_SYS_UTSNAME_H
+#undef ALLEGRO_HAVE_STDBOOL_H
 
 /* Define to 1 if the corresponding functions are available. */
 #undef ALLEGRO_HAVE_GETEXECNAME
@@ -122,6 +123,9 @@
 /* Define to enable Linux console VGA driver. */
 #undef ALLEGRO_LINUX_VGA
 
+/* Define to enable GLX driver. */
+#undef ALLEGRO_GLX
+
 /*---------------------------------------------------------------------------*/
 
 /* Define to the installed ALSA version. */
Index: include/allegro5/platform/astdint.h
===================================================================
--- include/allegro5/platform/astdint.h	(revision 9797)
+++ include/allegro5/platform/astdint.h	(working copy)
@@ -18,7 +18,7 @@
 #ifndef ASTDINT_H
 #define ASTDINT_H
 
-/* Please only include this file from include/allegro/internal/alconfig.h
+/* Please only include this file from include/allegro5/internal/alconfig.h
  * and don't add more than inttypes.h/stdint.h emulation here.  Thanks.
  */
 
Index: makefile.all
===================================================================
--- makefile.all	(revision 9797)
+++ makefile.all	(working copy)
@@ -277,10 +277,10 @@
 INSTALL_DIRS := \
     $(INSTALLDIR)/$(LIBDIR) \
     $(INSTALLDIR)/$(INCDIR) \
-    $(INSTALLDIR)/$(INCDIR)/allegro \
-    $(INSTALLDIR)/$(INCDIR)/allegro/platform \
-    $(INSTALLDIR)/$(INCDIR)/allegro/internal \
-    $(INSTALLDIR)/$(INCDIR)/allegro/inline
+    $(INSTALLDIR)/$(INCDIR)/allegro5 \
+    $(INSTALLDIR)/$(INCDIR)/allegro5/platform \
+    $(INSTALLDIR)/$(INCDIR)/allegro5/internal \
+    $(INSTALLDIR)/$(INCDIR)/allegro5/inline
 
 ifdef BINDIR
     INSTALL_DIRS += $(INSTALLDIR)/$(BINDIR)
@@ -317,16 +317,16 @@
 
 ifdef UNIX_TOOLS
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro/platform/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/platform/%.h: include/allegro5/platform/%.h
 	cp $< $@
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro/internal/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/internal/%.h: include/allegro5/internal/%.h
 	cp $< $@
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro/inline/%.inl
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/inline/%.inl: include/allegro5/inline/%.inl
 	cp $< $@
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/%.h: include/allegro5/%.h
 	cp $< $@
 
 $(INSTALLDIR_U)/$(INCDIR_U)/%.h: include/%.h
@@ -334,16 +334,16 @@
 
 else
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro/platform/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/platform/%.h: include/allegro5/platform/%.h
 	copy $(subst /,\,$< $@)
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro/internal/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/internal/%.h: include/allegro5/internal/%.h
 	copy $(subst /,\,$< $@)
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro/inline/%.inl
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/inline/%.inl: include/allegro5/inline/%.inl
 	copy $(subst /,\,$< $@)
 
-$(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro/%.h
+$(INSTALLDIR_U)/$(INCDIR_U)/allegro5/%.h: include/allegro5/%.h
 	copy $(subst /,\,$< $@)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/%.h: include/%.h
@@ -353,9 +353,9 @@
 
 
 INSTALL_FILES += $(INSTALLDIR_U)/$(INCDIR_U)/allegro.h                                                                         \
-                 $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/,$(notdir $(wildcard include/allegro/*.h)))                   \
-                 $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/,$(notdir $(wildcard include/allegro/internal/*.h))) \
-                 $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/,$(notdir $(wildcard include/allegro/inline/*.inl)))
+                 $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/,$(notdir $(wildcard include/allegro5/*.h)))                   \
+                 $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/internal/,$(notdir $(wildcard include/allegro5/internal/*.h))) \
+                 $(addprefix $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/inline/,$(notdir $(wildcard include/allegro5/inline/*.inl)))
 
 generic-install: create-install-dirs $(INSTALL_FILES)
 
@@ -363,28 +363,28 @@
 UNINSTALL_FILES := \
     $(wildcard \
         $(filter-out \
-            $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%, \
+            $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/platform/%, \
             $(UNINSTALL_FILES) \
         ) \
     ) \
     $(filter \
-        $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%, \
+        $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/platform/%, \
         $(UNINSTALL_FILES) \
     ) \
-    $(INSTALLDIR_U)/$(INCDIR_U)/allegro.h \
+    $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/allegro.h \
     $(wildcard \
-        $(INSTALLDIR_U)/$(INCDIR_U)/allegro/*.h \
-        $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/*.inl \
-        $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/*.h \
+        $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/*.h \
+        $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/inline/*.inl \
+        $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/internal/*.h \
     )
 
 generic-uninstall:
 ifdef UNIX_TOOLS
 	-rm -fv $(UNINSTALL_FILES)
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro
+	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/platform
+	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/inline
+	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro5/internal
+	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro5
 else
    define RM_FILES
       $(foreach file, $(UNINSTALL_FILES), del $(subst /,\,$(file))
Index: makefile.osx
===================================================================
--- makefile.osx	(revision 9797)
+++ makefile.osx	(working copy)
@@ -231,12 +231,12 @@
 	@install $< $(INSTALLDIR)/bin/
 
 BUILD_HEADERS = $(INCDIR)/osxalleg.h                  \
-          $(INCDIR)/allegro/platform/aintosx.h  \
-          $(INCDIR)/allegro/platform/aintunix.h \
-          $(INCDIR)/allegro/platform/alosxcfg.h \
-          $(INCDIR)/allegro/platform/alplatf.h  \
-          $(INCDIR)/allegro/platform/astdint.h  \
-          $(INCDIR)/allegro/platform/alosx.h
+          $(INCDIR)/allegro5/platform/aintosx.h  \
+          $(INCDIR)/allegro5/platform/aintunix.h \
+          $(INCDIR)/allegro5/platform/alosxcfg.h \
+          $(INCDIR)/allegro5/platform/alplatf.h  \
+          $(INCDIR)/allegro5/platform/astdint.h  \
+          $(INCDIR)/allegro5/platform/alosx.h
 
 HEADERS = $(addprefix $(INSTALLDIR)/,$(BUILD_HEADERS))
 
@@ -310,7 +310,7 @@
 else
 	@install $(LIB_NAME) $(FRAMEWORK)/Versions/$(shared_version)/$(FRAMEWORK_NAME)
 endif
-	@install include/allegro.h $(FRAMEWORK)/Versions/$(shared_version)/Headers
+	@install include/allegro5/allegro.h $(FRAMEWORK)/Versions/$(shared_version)/Headers
 	@install include/osxalleg.h $(FRAMEWORK)/Versions/$(shared_version)/Headers
 	@install $(BUILD_HEADERS) $(FRAMEWORK)/Versions/$(shared_version)/Headers
 	@(cd $(FRAMEWORK)/Versions; ln -s $(shared_version) Current)
Index: configure.in
===================================================================
--- configure.in	(revision 9797)
+++ configure.in	(working copy)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # Note we no longer use `autoheader' to produce
-# include/allegro/platform/alunixac.hin.  
+# include/allegro5/platform/alunixac.hin.  
 # If you AC_DEFINE a new symbol in this file, you must add it there also.
 #
 # Feel free to use # to denote comments.  Traditionally we used `dnl' but it
@@ -522,14 +522,20 @@
 
 ALLEGRO_ACTEST_SUPPORT_XWINDOWS
 if test "$allegro_support_xwindows" = yes; then
+  if test "$allegro_support_glx" = yes; then
+    ALLEGRO_MAYBE_XGLX_FILES=ALLEGRO_SRC_XGLX_FILES
+  fi
+
   ALLEGRO_MAYBE_XWINDOWS_FILES=ALLEGRO_SRC_X_FILES
   ALLEGRO_MAYBE_LIB_X_EXE_SOURCES=ALLEGRO_LIB_X_EXE_SOURCES
   ALLEGRO_MAYBE_LIB_X_EXES=ALLEGRO_LIB_X_EXES
 else
+  ALLEGRO_MAYBE_XGLX_FILES=ALLEGRO_EMPTY_LIST
   ALLEGRO_MAYBE_XWINDOWS_FILES=ALLEGRO_EMPTY_LIST
   ALLEGRO_MAYBE_LIB_X_EXE_SOURCES=ALLEGRO_EMPTY_LIST
   ALLEGRO_MAYBE_LIB_X_EXES=ALLEGRO_EMPTY_LIST
 fi
+AC_SUBST(ALLEGRO_MAYBE_XGLX_FILES)
 AC_SUBST(ALLEGRO_MAYBE_XWINDOWS_FILES)
 AC_SUBST(ALLEGRO_MAYBE_LIB_X_EXE_SOURCES)
 AC_SUBST(ALLEGRO_MAYBE_LIB_X_EXES)
@@ -983,7 +989,7 @@
 fi
 
 dnl Prepare alunixac.h.
-AC_CONFIG_HEADER(include/allegro/platform/alunixac.h:include/allegro/platform/alunixac.hin)
+AC_CONFIG_HEADER(include/allegro5/platform/alunixac.h:include/allegro5/platform/alunixac.hin)
 
 dnl Cosmetics for allegro-config
 FRAMEWORKS=
Index: misc/zipwin.sh
===================================================================
--- misc/zipwin.sh	(revision 9797)
+++ misc/zipwin.sh	(working copy)
@@ -36,7 +36,7 @@
 
 
 # check that we are in the Allegro dir
-if [ ! -f include/allegro.h ]; then
+if [ ! -f include/allegro5/allegro.h ]; then
    echo "Oops, you don't appear to be in the root of the Allegro directory" 1>&2
    exit 1
 fi
Index: misc/grabdeps.pl
===================================================================
--- misc/grabdeps.pl	(revision 0)
+++ misc/grabdeps.pl	(revision 0)
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+use File::Spec;
+
+# we assume we are running from the allegro root dir
+my $inc_dir = 'include';
+my $file = $ARGV[0];
+our %deps;
+
+grab_deps($file);
+
+print " ", join(" ", keys %deps);
+
+sub grab_deps {
+	my $gpath = shift();
+	open my $fh, $gpath or return; #die "failed to open $path: $!";
+	for my $line (<$fh>) {
+		if($line =~ /#\s*include\s+"([^"]+)"/) {
+			my $file = $1;
+			my $path = File::Spec->catfile($inc_dir, $file);
+			if($file =~ /\.s$/ || $file =~ /\.inc$/) {
+				my ($volume,$dirs,$file) = File::Spec->splitpath( $gpath );
+				my $rpath = File::Spec->catfile($dirs, $file);
+				$deps{$rpath} = 1;
+
+				grab_deps($rpath);
+			}
+			elsif(-f $file || $file =~ /asmdef/) {
+				$deps{$file} = 1;
+				grab_deps($file);
+			}
+			elsif(!exists $deps{$path} && -f $path) {
+				$deps{$path} = 1;
+				grab_deps($path);
+			}
+		}
+	}
+}

Property changes on: misc/grabdeps.pl
___________________________________________________________________
Name: svn:executable
   + *

Index: misc/fixver.sh
===================================================================
--- misc/fixver.sh	(revision 9797)
+++ misc/fixver.sh	(working copy)
@@ -45,9 +45,9 @@
 echo "s/\#define ALLEGRO_DATE_STR .*/\#define ALLEGRO_DATE_STR         \"$year\"/" >> fixver.sed
 echo "s/\#define ALLEGRO_DATE .*/\#define ALLEGRO_DATE             $year$month$day    \/\* yyyymmdd \*\//" >> fixver.sed
 
-echo "Patching include/allegro/base.h..."
-cp include/allegro/base.h fixver.tmp
-sed -f fixver.sed fixver.tmp > include/allegro/base.h
+echo "Patching include/allegro5/base.h..."
+cp include/allegro5/base.h fixver.tmp
+sed -f fixver.sed fixver.tmp > include/allegro5/base.h
 
 # Note: DMC does not support { and } in resource files so we use
 # BEGIN and END instead.
Index: misc/fixpatch.sh
===================================================================
--- misc/fixpatch.sh	(revision 9797)
+++ misc/fixpatch.sh	(working copy)
@@ -7,7 +7,7 @@
 touch makefile.in
 touch aclocal.m4
 touch acconfig.h
-touch include/allegro/platform/alunixac.hin
+touch include/allegro5/platform/alunixac.hin
 touch stamp-h.in
 touch configure
 
Index: misc/scanexp.c
===================================================================
--- misc/scanexp.c	(revision 9797)
+++ misc/scanexp.c	(working copy)
@@ -22,7 +22,7 @@
 
 #if defined ALLEGRO_API
 
-   #include "allegro5.h"
+   #include "allegro5/allegro5.h"
 
 #elif defined ALLEGRO_WINAPI
 
Index: misc/deplib.sh
===================================================================
--- misc/deplib.sh	(revision 9797)
+++ misc/deplib.sh	(working copy)
@@ -33,17 +33,19 @@
 
 
 # See src/unix/udummy.c for the rationale
-sources=`echo $* | sed 's,[^	 ]*/,,g'`
+sources=`echo $* | sed 's,src/,,g'`
 sharable_sources=`echo $sources | sed 's,[^.	 ]*\.s,,g'`
-sharable_sources=`echo $sharable_sources | sed 's,[	 ]*udummy\.c,,g'`
+sharable_sources=`echo $sharable_sources | sed 's,[	 ]*unix/udummy\.c,,g'`
 unsharable_sources=`echo $sources | sed 's,[^.	 ]*\.[^s],,g'`
-unsharable_sources=`echo $unsharable_sources udummy.c`
+unsharable_sources=`echo $unsharable_sources unix/udummy.c`
 
 objects=`echo $sources | sed 's,\.[^.	 ]*,,g'`
 sharable_objects=`echo $sharable_sources | sed 's,\.[^.	 ]*,,g'`
 unsharable_objects=`echo $unsharable_sources | sed 's,\.[^.	 ]*,,g'`
 
 
+echo \# sources: $sources
+
 # Normal library.
 prev="LIBALLEG_OBJECTS ="
 for file in .. $objects; do
@@ -56,8 +58,10 @@
 prev="LIBALLEG_SHARED_OBJECTS ="
 for file in .. $sharable_objects; do
   if test "$file" != ..; then
-    echo "$prev \\"
-    prev="  \$(OBJDIR)/shared/alleg/$file\$(OBJ)"
+#    if test -n "$file"; then
+	    echo "$prev \\"
+	    prev="  \$(OBJDIR)/shared/alleg/$file\$(OBJ)"
+#    fi
   fi
 done
 echo "$prev"
@@ -87,8 +91,10 @@
 prev="LIBALLD_SHARED_OBJECTS ="
 for file in .. $sharable_objects; do
   if test "$file" != ..; then
-    echo "$prev \\"
-    prev="  \$(OBJDIR)/shared/alld/$file\$(OBJ)"
+#    if test -n "$file"; then
+      echo "$prev \\"
+      prev="  \$(OBJDIR)/shared/alld/$file\$(OBJ)"
+#    fi
   fi
 done
 echo "$prev"
@@ -118,8 +124,10 @@
 prev="LIBALLP_SHARED_OBJECTS ="
 for file in .. $sharable_objects; do
   if test "$file" != ..; then
-    echo "$prev \\"
-    prev="  \$(OBJDIR)/shared/allp/$file\$(OBJ)"
+#    if test -n "$file"; then
+      echo "$prev \\"
+      prev="  \$(OBJDIR)/shared/allp/$file\$(OBJ)"
+#    fi
   fi
 done
 echo "$prev"
@@ -141,94 +149,54 @@
 symbols=
 for file in .. $*; do
   if test -f "$file"; then
-    dir=`echo $file | sed 's,/[^/]*$,,'`
-    name=`echo $file | sed 's,^.*/,,;s,\.[^.]*$,,'`
+    dir=`echo $file | sed 's,/[^/]*$,,;s,src,,'`
+    name=`echo $file | sed 's,^.*/,/,;s,\.[^.]*$,,'`
     ext=`echo $file | sed 's,^.*\.,,'`
-    includes=
-    deps="$file"
-    while test -n "$deps"; do
-      newdeps=
-      for dep in $deps; do
-        includes1=`grep '^[ 	]*#[ 	]*include[ 	]*[a-zA-Z0-9_][a-zA-Z0-9_]*' $dep | \
-          sed 's,^[ 	]*#[ 	]*include[ 	]*\([a-zA-Z0-9_]*\),\1,'`
-        includes2=`grep '^[ 	]*#[ 	]*include[ 	]*".*"' $dep | \
-          sed 's,^[ 	]*#[ 	]*include[ 	]*"\(.*\)",\1,'`
-        if test -n "$includes1"; then
-          for include in $includes1; do
-	    includes="$includes \$($include)"
-	    case "$symbols" in
-	    *$include* )
-	      ;;
-	    * )
-	      symbols="$symbols $include"
-	      ;;
-	    esac
-          done
-        fi
-        if test -n "$includes2"; then
-          for include in $includes2; do
-	    if test -f "$dir/$include"; then
-              includes="$includes \$(srcdir)/$dir/$include"
-	      newdeps="$newdeps $dir/$include"
-	    else
-	      include=`echo $include | sed 's,[-./],_,g'`
-	      includes="$includes \$($include)"
-	      case "$symbols" in
-	      *$include* )
-	        ;;
-	      * )
-	        symbols="$symbols $include"
-	        ;;
-	      esac
-	    fi
-          done
-        fi
-      done
-      deps="$newdeps"
-    done
+    includes=`./misc/grabdeps.pl $file`
+    deps=
 
     # Normal library.
-    echo "\$(OBJDIR)/alleg/$name\$(OBJ): \$(srcdir)/$file$includes"
+    echo "\$(OBJDIR)/alleg$dir$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg$dir$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg$dir$name\$(OBJ)"
     fi
-    echo "\$(OBJDIR)/shared/alleg/$name\$(OBJ): \$(srcdir)/$file$includes"
+    echo "\$(OBJDIR)/shared/alleg$dir$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_NORMAL) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_NORMAL) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg$dir$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg$dir$name\$(OBJ)"
     fi
     echo ""
 
     # Debugging library.
-    echo "\$(OBJDIR)/alld/$name\$(OBJ): \$(srcdir)/$file$includes"
+    echo "\$(OBJDIR)/alld$dir$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_DEBUG) -c \$(srcdir)/$file -o \$(OBJDIR)/alld/$name\$(OBJ)"
+      echo "	\$(COMPILE_DEBUG) -c \$(srcdir)/$file -o \$(OBJDIR)/alld$dir$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_DEBUG) -c \$(srcdir)/$file -o \$(OBJDIR)/alld/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_DEBUG) -c \$(srcdir)/$file -o \$(OBJDIR)/alld$dir$name\$(OBJ)"
     fi
-    echo "\$(OBJDIR)/shared/alld/$name\$(OBJ): \$(srcdir)/$file$includes"
+    echo "\$(OBJDIR)/shared/alld$dir$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_DEBUG) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alld/$name\$(OBJ)"
+      echo "	\$(COMPILE_DEBUG) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alld$dir$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_DEBUG) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alld/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_DEBUG) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alld$dir$name\$(OBJ)"
     fi
     echo ""
 
     # Profiling library.
-    echo "\$(OBJDIR)/allp/$name\$(OBJ): \$(srcdir)/$file$includes"
+    echo "\$(OBJDIR)/allp$dir$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_PROFILE) -c \$(srcdir)/$file -o \$(OBJDIR)/allp/$name\$(OBJ)"
+      echo "	\$(COMPILE_PROFILE) -c \$(srcdir)/$file -o \$(OBJDIR)/allp$dir$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_PROFILE) -c \$(srcdir)/$file -o \$(OBJDIR)/allp/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_PROFILE) -c \$(srcdir)/$file -o \$(OBJDIR)/allp$dir$name\$(OBJ)"
     fi
-    echo "\$(OBJDIR)/shared/allp/$name\$(OBJ): \$(srcdir)/$file$includes"
+    echo "\$(OBJDIR)/shared/allp$dir$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_PROFILE) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/allp/$name\$(OBJ)"
+      echo "	\$(COMPILE_PROFILE) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/allp$dir$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_PROFILE) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/allp/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_PROFILE) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/allp$dir$name\$(OBJ)"
     fi
     echo ""
   elif test "$file" != ..; then
Index: misc/checklst.pl
===================================================================
--- misc/checklst.pl	(revision 0)
+++ misc/checklst.pl	(revision 0)
@@ -0,0 +1,56 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use File::Spec::Functions;
+
+my $path = $ARGV[0];
+
+if(!defined $path || !-d $path) {
+	print "usage $0 <path to allegro root>\n";
+	exit 0;
+}
+
+my %main_sources;
+my $srcdir = catdir $path, "src";
+opendir DIR, $srcdir or die "failed to scan $path: $!\n";
+for my $ent (readdir DIR) {
+	my $fpath = catfile('src',$ent);
+	next if !-f $fpath;
+	if($ent =~ /\.c$/) {
+		$main_sources{$fpath} = 1;
+	}
+}
+closedir DIR;
+
+my $lstdata;
+open FH, catfile($path,"makefile.lst") or die "failed to open makefile.lst: $!";
+	$lstdata = join '', <FH>;
+close FH;
+
+$lstdata =~ s/\\\r?\n//sg;
+$lstdata =~ s/[ \t]+/ /g;
+my @lines = split /\r?\n/, $lstdata;
+
+my %lstdata;
+for my $line (@lines) {
+	chomp $line;
+	next if $line =~ /^#/;
+	next if $line =~ /^\s*$/;
+	my ($name, $value) = split /\s*=\s*/, $line;
+	$lstdata{$name} = $value;
+#	print $name."\n";
+}
+
+#print $lstdata{"ALLEGRO_SRC_FILES"}."\n";
+
+my %srcfiles = map { $_ => 1 } split /\s/, $lstdata{"ALLEGRO_SRC_FILES"};
+my @missing_sources;
+for my $file (keys %main_sources) {
+	if(!exists $srcfiles{$file}) {
+#		print "warning, $file exists on disk, but wasn't added to ALLEGRO_SRC_FILES\n";
+		push @missing_sources, $file;
+	}
+}
+
+print "warning, the following files exist, but aren't in ALLEGRO_SRC_FILES: ".join(" ",@missing_sources)."\n";

Property changes on: misc/checklst.pl
___________________________________________________________________
Name: svn:executable
   + *

Index: fix.sh
===================================================================
--- fix.sh	(revision 9797)
+++ fix.sh	(working copy)
@@ -30,8 +30,8 @@
       echo "include makefile.all" >> makefile
    fi
 
-   echo "/* generated by fix.sh */" > include/allegro/platform/alplatf.h
-   echo "#define $3" >> include/allegro/platform/alplatf.h
+   echo "/* generated by fix.sh */" > include/allegro5/platform/alplatf.h
+   echo "#define $3" >> include/allegro5/platform/alplatf.h
 }
 
 proc_fix_osx_ub()
@@ -43,8 +43,8 @@
    echo "MAKEFILE_INC = makefile.osx" >> makefile
    echo "include makefile.all" >> makefile
 
-   echo "/* generated by fix.sh */" > include/allegro/platform/alplatf.h
-   echo "#define ALLEGRO_MACOSX" >> include/allegro/platform/alplatf.h
+   echo "/* generated by fix.sh */" > include/allegro5/platform/alplatf.h
+   echo "#define ALLEGRO_MACOSX" >> include/allegro5/platform/alplatf.h
 }
 
 proc_filelist()
Index: setup/keyconf.c
===================================================================
--- setup/keyconf.c	(revision 9797)
+++ setup/keyconf.c	(working copy)
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 
 /* The code can't link on platforms that don't use src/misc/pckeys.c (everything
Index: setup/setup.c
===================================================================
--- setup/setup.c	(revision 9797)
+++ setup/setup.c	(working copy)
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "allegro5.h"
-#include "allegro/internal/aintern.h"
+#include "allegro5/allegro5.h"
+#include "allegro5/internal/aintern.h"
 
 #ifdef ALLEGRO_LINUX
    #include <sys/time.h>
Index: makefile.bcc
===================================================================
--- makefile.bcc	(revision 9797)
+++ makefile.bcc	(working copy)
@@ -175,13 +175,13 @@
 
 
 HEADERS = $(BCC32DIR_U)/include/winalleg.h                  \
-          $(BCC32DIR_U)/include/allegro/platform/aintwin.h  \
-          $(BCC32DIR_U)/include/allegro/platform/al386gcc.h \
-          $(BCC32DIR_U)/include/allegro/platform/albcc32.h  \
-          $(BCC32DIR_U)/include/allegro/platform/alplatf.h  \
-          $(BCC32DIR_U)/include/allegro/platform/astdbool.h \
-          $(BCC32DIR_U)/include/allegro/platform/astdint.h  \
-          $(BCC32DIR_U)/include/allegro/platform/alwin.h
+          $(BCC32DIR_U)/include/allegro5/platform/aintwin.h  \
+          $(BCC32DIR_U)/include/allegro5/platform/al386gcc.h \
+          $(BCC32DIR_U)/include/allegro5/platform/albcc32.h  \
+          $(BCC32DIR_U)/include/allegro5/platform/alplatf.h  \
+          $(BCC32DIR_U)/include/allegro5/platform/astdbool.h \
+          $(BCC32DIR_U)/include/allegro5/platform/astdint.h  \
+          $(BCC32DIR_U)/include/allegro5/platform/alwin.h
 
 INSTALL_FILES = $(BCC32DIR_U)/lib/$(IMPLIB_BASENAME)
 
Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 9797)
+++ aclocal.m4	(working copy)
@@ -276,6 +276,10 @@
 [  --enable-xim[=x]        enable the use of XIM keyboard input [default=yes]],
 test "X$enableval" != "Xno" && allegro_enable_xim=yes,
 allegro_enable_xim=yes)
+AC_ARG_ENABLE(glx,
+[  --enable-glx[=x]        enable the use of GLX [default=yes]],
+test "X$enableval" != "Xno" && allegro_enable_glx=yes,
+allegro_enable_glx=yes)
 
 dnl Process "--with[out]-x", "--x-includes" and "--x-libraries" options.
 _x11="X11 support: disabled"
@@ -295,6 +299,17 @@
   _x11="X11 support: enabled"
   _x11ext=""
 
+  dnl Test for glX support
+  if test -n "$allegro_enable_glx"; then
+    allegro_support_glx=yes
+    AC_CHECK_LIB(GL, glXCreateWindow,
+      [_x11ext="$_x11ext glX"
+      LIBS="-lGL $LIBS"
+      AC_DEFINE(ALLEGRO_GLX,1,[Define if glx support is available.])
+      ])
+  fi
+
+
   dnl Test for Xext library.
   AC_CHECK_LIB(Xext, XMissingExtension,
     [_x11ext="$_x11ext Xext"
Index: examples/exswitch.c
===================================================================
--- examples/exswitch.c	(revision 9797)
+++ examples/exswitch.c	(working copy)
@@ -17,7 +17,7 @@
 
 #include <math.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exconfig.c
===================================================================
--- examples/exconfig.c	(revision 9797)
+++ examples/exconfig.c	(working copy)
@@ -12,7 +12,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 int main(void)
Index: examples/exsprite.c
===================================================================
--- examples/exsprite.c	(revision 9797)
+++ examples/exsprite.c	(working copy)
@@ -37,7 +37,7 @@
  */
 
 #include <math.h>
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 #include "running.h"
 
 
Index: examples/ex3d.c
===================================================================
--- examples/ex3d.c	(revision 9797)
+++ examples/ex3d.c	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/excustom.c
===================================================================
--- examples/excustom.c	(revision 9797)
+++ examples/excustom.c	(working copy)
@@ -11,7 +11,7 @@
 
 #include <time.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 #include "example.h"
 
 
Index: examples/excolmap.c
===================================================================
--- examples/excolmap.c	(revision 9797)
+++ examples/excolmap.c	(working copy)
@@ -15,7 +15,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/expal.c
===================================================================
--- examples/expal.c	(revision 9797)
+++ examples/expal.c	(working copy)
@@ -7,7 +7,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exdbuf.c
===================================================================
--- examples/exdbuf.c	(revision 9797)
+++ examples/exdbuf.c	(working copy)
@@ -7,7 +7,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exsample.c
===================================================================
--- examples/exsample.c	(revision 9797)
+++ examples/exsample.c	(working copy)
@@ -11,7 +11,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exmidi.c
===================================================================
--- examples/exmidi.c	(revision 9797)
+++ examples/exmidi.c	(working copy)
@@ -5,7 +5,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exnew_d3d.cpp
===================================================================
--- examples/exnew_d3d.cpp	(revision 9797)
+++ examples/exnew_d3d.cpp	(working copy)
@@ -2,7 +2,7 @@
  * Example of using D3D calls
  * by Jacob Dawid
  */
-#include <allegro5.h>
+#include <allegro5/allegro.h>
 #include <allegro5/winalleg.h>
 #include <d3d9.h>              
 #include <d3dx9.h>       
Index: examples/expat.c
===================================================================
--- examples/expat.c	(revision 9797)
+++ examples/expat.c	(working copy)
@@ -5,7 +5,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exnew_mouse_events.c
===================================================================
--- examples/exnew_mouse_events.c	(revision 9797)
+++ examples/exnew_mouse_events.c	(working copy)
@@ -1,4 +1,4 @@
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 int main(void)
 {
Index: examples/extrans.c
===================================================================
--- examples/extrans.c	(revision 9797)
+++ examples/extrans.c	(working copy)
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exscale.c
===================================================================
--- examples/exscale.c	(revision 9797)
+++ examples/exscale.c	(working copy)
@@ -7,7 +7,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exsyscur.c
===================================================================
--- examples/exsyscur.c	(revision 9797)
+++ examples/exsyscur.c	(working copy)
@@ -6,7 +6,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 static int black, white;
Index: examples/exstars.c
===================================================================
--- examples/exstars.c	(revision 9797)
+++ examples/exstars.c	(working copy)
@@ -7,7 +7,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exjoy.c
===================================================================
--- examples/exjoy.c	(revision 9797)
+++ examples/exjoy.c	(working copy)
@@ -8,7 +8,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exhello.c
===================================================================
--- examples/exhello.c	(revision 9797)
+++ examples/exhello.c	(working copy)
@@ -6,7 +6,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exaccel.c
===================================================================
--- examples/exaccel.c	(revision 9797)
+++ examples/exaccel.c	(working copy)
@@ -13,7 +13,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exexedat.c
===================================================================
--- examples/exexedat.c	(revision 9797)
+++ examples/exexedat.c	(working copy)
@@ -22,7 +22,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 /* the grabber produces this header, which contains defines for the names
Index: examples/exbitmap.c
===================================================================
--- examples/exbitmap.c	(revision 9797)
+++ examples/exbitmap.c	(working copy)
@@ -9,7 +9,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exnew_events.c
===================================================================
--- examples/exnew_events.c	(revision 9797)
+++ examples/exnew_events.c	(working copy)
@@ -14,7 +14,7 @@
 #include <stdio.h>
 
 #define ALLEGRO_NO_COMPATIBILITY
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 /* globals */
Index: examples/ex12bit.c
===================================================================
--- examples/ex12bit.c	(revision 9797)
+++ examples/ex12bit.c	(working copy)
@@ -44,7 +44,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/extruec.c
===================================================================
--- examples/extruec.c	(revision 9797)
+++ examples/extruec.c	(working copy)
@@ -9,7 +9,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exshade.c
===================================================================
--- examples/exshade.c	(revision 9797)
+++ examples/exshade.c	(working copy)
@@ -14,7 +14,7 @@
 
 #include <math.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exalpha.c
===================================================================
--- examples/exalpha.c	(revision 9797)
+++ examples/exalpha.c	(working copy)
@@ -11,7 +11,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exxfade.c
===================================================================
--- examples/exxfade.c	(revision 9797)
+++ examples/exxfade.c	(working copy)
@@ -11,7 +11,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/excamera.c
===================================================================
--- examples/excamera.c	(revision 9797)
+++ examples/excamera.c	(working copy)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 #ifndef M_PI
Index: examples/exlights.c
===================================================================
--- examples/exlights.c	(revision 9797)
+++ examples/exlights.c	(working copy)
@@ -35,7 +35,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exrgbhsv.c
===================================================================
--- examples/exrgbhsv.c	(revision 9797)
+++ examples/exrgbhsv.c	(working copy)
@@ -19,7 +19,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 #define DIALOG_NUM_SLIDERS       6
Index: examples/ex3buf.c
===================================================================
--- examples/ex3buf.c	(revision 9797)
+++ examples/ex3buf.c	(working copy)
@@ -11,7 +11,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exfixed.c
===================================================================
--- examples/exfixed.c	(revision 9797)
+++ examples/exfixed.c	(working copy)
@@ -9,7 +9,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exnew_mouse.c
===================================================================
--- examples/exnew_mouse.c	(revision 9797)
+++ examples/exnew_mouse.c	(working copy)
@@ -1,4 +1,4 @@
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 int main(void)
 {
Index: examples/exnew_icon.c
===================================================================
--- examples/exnew_icon.c	(revision 9797)
+++ examples/exnew_icon.c	(working copy)
@@ -1,4 +1,4 @@
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 int main(void)
 {
Index: examples/exfont.c
===================================================================
--- examples/exfont.c	(revision 9797)
+++ examples/exfont.c	(working copy)
@@ -5,7 +5,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exscn3d.c
===================================================================
--- examples/exscn3d.c	(revision 9797)
+++ examples/exscn3d.c	(working copy)
@@ -10,7 +10,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exquat.c
===================================================================
--- examples/exquat.c	(revision 9797)
+++ examples/exquat.c	(working copy)
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exkeys.c
===================================================================
--- examples/exkeys.c	(revision 9797)
+++ examples/exkeys.c	(working copy)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
@@ -201,7 +201,7 @@
       textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
    } while (k != 27);
 
-   /* various scan codes are defined in allegro5.h as KEY_* constants */
+   /* various scan codes are defined in allegro5/allegro5.h as KEY_* constants */
    scroll(); scroll(); scroll();
    textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "Press F6");
    scroll();
Index: examples/exmem.c
===================================================================
--- examples/exmem.c	(revision 9797)
+++ examples/exmem.c	(working copy)
@@ -7,7 +7,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/extimer.c
===================================================================
--- examples/extimer.c	(revision 9797)
+++ examples/extimer.c	(working copy)
@@ -11,7 +11,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exflame.c
===================================================================
--- examples/exflame.c	(revision 9797)
+++ examples/exflame.c	(working copy)
@@ -8,7 +8,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exgui.c
===================================================================
--- examples/exgui.c	(revision 9797)
+++ examples/exgui.c	(working copy)
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 #include "example.h"
 
 
Index: examples/exmouse.c
===================================================================
--- examples/exmouse.c	(revision 9797)
+++ examples/exmouse.c	(working copy)
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exflip.c
===================================================================
--- examples/exflip.c	(revision 9797)
+++ examples/exflip.c	(working copy)
@@ -6,7 +6,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exstream.c
===================================================================
--- examples/exstream.c	(revision 9797)
+++ examples/exstream.c	(working copy)
@@ -9,7 +9,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 #define BUFFER_SIZE  1024
Index: examples/exzbuf.c
===================================================================
--- examples/exzbuf.c	(revision 9797)
+++ examples/exzbuf.c	(working copy)
@@ -12,7 +12,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exdata.c
===================================================================
--- examples/exdata.c	(revision 9797)
+++ examples/exdata.c	(working copy)
@@ -8,7 +8,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 /* the grabber produces this header, which contains defines for the names
Index: examples/exunicod.c
===================================================================
--- examples/exunicod.c	(revision 9797)
+++ examples/exunicod.c	(working copy)
@@ -14,7 +14,7 @@
 
 
 #include <stdlib.h>
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 #define DATAFILE_NAME   "unifont.dat"
 
Index: examples/exupdate.c
===================================================================
--- examples/exupdate.c	(revision 9797)
+++ examples/exupdate.c	(working copy)
@@ -16,7 +16,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exnewapi.c
===================================================================
--- examples/exnewapi.c	(revision 9797)
+++ examples/exnewapi.c	(working copy)
@@ -8,7 +8,7 @@
 
 #include <math.h>
 #include <stdio.h>
-#include "allegro5.h"
+#include "allegro5/allegro5.h"
 
 int main(void)
 {
Index: examples/exblend.c
===================================================================
--- examples/exblend.c	(revision 9797)
+++ examples/exblend.c	(working copy)
@@ -10,7 +10,7 @@
  */
 
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exspline.c
===================================================================
--- examples/exspline.c	(revision 9797)
+++ examples/exspline.c	(working copy)
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 
Index: examples/exscroll.c
===================================================================
--- examples/exscroll.c	(revision 9797)
+++ examples/exscroll.c	(working copy)
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 
-#include <allegro5.h>
+#include <allegro5/allegro5.h>
 
 
 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/