summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-05-21 12:34:07 -0400
committerKristian Høgsberg <krh@redhat.com>2008-05-21 12:36:25 -0400
commita8a9b40e554dd0c184866978889a39519afc466a (patch)
treebc94079918645152753b39740400a1c145492391
parente5aad4bc087036489e2af576628aa9b612054a6e (diff)
Move the windows GL files to the xwin DDX.
-rw-r--r--hw/xwin/Makefile.am7
-rw-r--r--hw/xwin/glx/ChangeLog (renamed from GL/windows/ChangeLog)0
-rw-r--r--hw/xwin/glx/glwindows.h (renamed from GL/windows/glwindows.h)0
-rwxr-xr-xhw/xwin/glx/glwrap.c (renamed from GL/windows/glwrap.c)0
-rwxr-xr-xhw/xwin/glx/indirect.c (renamed from GL/windows/indirect.c)0
5 files changed, 7 insertions, 0 deletions
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 5ffba1274..a88528901 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -167,7 +167,14 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
dist_man1_MANS = XWin.man XWinrc.man
+GLX_EXTRAS = \
+ windows/ChangeLog \
+ windows/glwindows.h \
+ windows/glwrap.c \
+ windows/indirect.c
+
EXTRA_DIST = \
+ $(GLX_EXTRAS) \
_usr_X11R6_lib_X11_system.XWinrc \
X-boxed.ico \
X.ico \
diff --git a/GL/windows/ChangeLog b/hw/xwin/glx/ChangeLog
index 43a817d6a..43a817d6a 100644
--- a/GL/windows/ChangeLog
+++ b/hw/xwin/glx/ChangeLog
diff --git a/GL/windows/glwindows.h b/hw/xwin/glx/glwindows.h
index 74e81f24f..74e81f24f 100644
--- a/GL/windows/glwindows.h
+++ b/hw/xwin/glx/glwindows.h
diff --git a/GL/windows/glwrap.c b/hw/xwin/glx/glwrap.c
index f0b38b228..f0b38b228 100755
--- a/GL/windows/glwrap.c
+++ b/hw/xwin/glx/glwrap.c
diff --git a/GL/windows/indirect.c b/hw/xwin/glx/indirect.c
index 5e12022f4..5e12022f4 100755
--- a/GL/windows/indirect.c
+++ b/hw/xwin/glx/indirect.c