OSDN Git Service

Segregate source that cannot take on the MinGW.org LICENSE.
authorEarnie Boyd <earnie@users.sourceforge.net>
Wed, 5 Sep 2012 14:02:24 +0000 (10:02 -0400)
committerEarnie Boyd <earnie@users.sourceforge.net>
Wed, 5 Sep 2012 14:02:24 +0000 (10:02 -0400)
* Makefile.in: Make changes based on moved files.
* gpl/*: Move to misc/gpl/*.
* include/GL/*: Move to misc/include/GL/*.
* src/libcrt/math/cephes_mconf.h: Move to
misc/src/include/cephes_mconf.h.
* src/libcrt/include/gdtoa.h: Move to misc/src/include/gdtoa.h.
* src/libcrt/gdtoa/*: Move to misc/src/libcrt/gdtoa/*.
* src/libcrt/math/cbrt.c: Move to misc/src/libcrt/math/cbrt.c.
* src/libcrt/math/cbrtf.c: Move to misc/src/libcrt/math/cbrtf.c.
* src/libcrt/math/cbrtl.c: Move to misc/src/libcrt/math/cbrtl.c.
* src/libcrt/math/coshl.c: Move to misc/src/libcrt/math/coshl.c.
* src/libcrt/math/erfl.c: Move to misc/src/libcrt/math/erfl.c.
* src/libcrt/math/frexpl.S: Move to misc/src/libcrt/math/frexpl.S.
* src/libcrt/math/hypotl.c: Move to misc/src/libcrt/math/hypotl.c.
* src/libcrt/math/lgamma.c: Move to misc/src/libcrt/math/lgamma.c.
* src/libcrt/math/lgammaf.c: Move to misc/src/libcrt/math/lgammaf.c.
* src/libcrt/math/pow.c: Move to misc/src/libcrt/math/pow.c.
* src/libcrt/math/powi.c: Move to misc/src/libcrt/math/powi.c.
* src/libcrt/math/powif.c: Move to misc/src/libcrt/math/powif.c.
* src/libcrt/math/powil.c: Move to misc/src/libcrt/math/powil.c.
* src/libcrt/math/powl.c: Move to misc/src/libcrt/math/powl.c.
* src/libcrt/math/sinhl.c: Move to misc/src/libcrt/math/sinhl.c.
* src/libcrt/math/tanhl.c: Move to misc/src/libcrt/math/tanhl.c.
* src/libcrt/math/tgamma.c: Move to misc/src/libcrt/math/tgamma.c.
* src/libcrt/math/tgammaf.c: Move to misc/src/libcrt/math/tgammaf.c.
* src/libcrt/profile/*: Move to misc/src/libcrt/profile/*.
* src/libcrt/libdinput/*: Move to misc/src/libcrt/libdinput/*.
* src/libcrt/libdmoguids/*: Move to misc/src/libcrt/libdmoguids/*.
* src/libcrt/libdxerr8/*: Move to misc/src/libcrt/libdxerr8/*.
* src/libcrt/libdxerr9/*: Move to misc/src/libcrt/libdxerr9/*.
* src/libcrt/libdxguid/*: Move to misc/src/libcrt/libdxguid/*.
* src/libcrt/libksuser/*: Move to misc/src/libcrt/libksuser/*.
* src/libcrt/libstrmiids/*: Move to misc/src/libcrt/libstrmiids/*.

75 files changed:
ChangeLog
Makefile.in
misc/gpl/profile/COPYING [moved from gpl/profile/COPYING with 100% similarity]
misc/gpl/profile/CYGWIN_LICENSE [moved from gpl/profile/CYGWIN_LICENSE with 100% similarity]
misc/gpl/profile/gcrt0.c [moved from gpl/profile/gcrt0.c with 100% similarity]
misc/gpl/profile/profil.c [moved from gpl/profile/profil.c with 100% similarity]
misc/gpl/profile/profil.h [moved from gpl/profile/profil.h with 100% similarity]
misc/include/GL/gl.h [moved from include/GL/gl.h with 100% similarity]
misc/include/GL/glext.h [moved from include/GL/glext.h with 100% similarity]
misc/include/GL/glu.h [moved from include/GL/glu.h with 100% similarity]
misc/src/include/cephes_mconf.h [moved from src/libcrt/math/cephes_mconf.h with 100% similarity]
misc/src/include/gdtoa.h [moved from src/libcrt/include/gdtoa.h with 100% similarity]
misc/src/libcrt/gdtoa/README [moved from src/libcrt/gdtoa/README with 100% similarity]
misc/src/libcrt/gdtoa/README.mingw [moved from src/libcrt/gdtoa/README.mingw with 100% similarity]
misc/src/libcrt/gdtoa/arithchk.c [moved from src/libcrt/gdtoa/arithchk.c with 100% similarity]
misc/src/libcrt/gdtoa/dmisc.c [moved from src/libcrt/gdtoa/dmisc.c with 100% similarity]
misc/src/libcrt/gdtoa/dtoa.c [moved from src/libcrt/gdtoa/dtoa.c with 100% similarity]
misc/src/libcrt/gdtoa/g__fmt.c [moved from src/libcrt/gdtoa/g__fmt.c with 100% similarity]
misc/src/libcrt/gdtoa/g_dfmt.c [moved from src/libcrt/gdtoa/g_dfmt.c with 100% similarity]
misc/src/libcrt/gdtoa/g_ffmt.c [moved from src/libcrt/gdtoa/g_ffmt.c with 100% similarity]
misc/src/libcrt/gdtoa/g_xfmt.c [moved from src/libcrt/gdtoa/g_xfmt.c with 100% similarity]
misc/src/libcrt/gdtoa/gd_qnan.h [moved from src/libcrt/gdtoa/gd_qnan.h with 100% similarity]
misc/src/libcrt/gdtoa/gdtoa.c [moved from src/libcrt/gdtoa/gdtoa.c with 100% similarity]
misc/src/libcrt/gdtoa/gdtoa_fltrnds.h [moved from src/libcrt/gdtoa/gdtoa_fltrnds.h with 100% similarity]
misc/src/libcrt/gdtoa/gdtoaimp.h [moved from src/libcrt/gdtoa/gdtoaimp.h with 100% similarity]
misc/src/libcrt/gdtoa/gethex.c [moved from src/libcrt/gdtoa/gethex.c with 100% similarity]
misc/src/libcrt/gdtoa/gmisc.c [moved from src/libcrt/gdtoa/gmisc.c with 100% similarity]
misc/src/libcrt/gdtoa/hd_init.c [moved from src/libcrt/gdtoa/hd_init.c with 100% similarity]
misc/src/libcrt/gdtoa/hexnan.c [moved from src/libcrt/gdtoa/hexnan.c with 100% similarity]
misc/src/libcrt/gdtoa/misc.c [moved from src/libcrt/gdtoa/misc.c with 100% similarity]
misc/src/libcrt/gdtoa/qnan.c [moved from src/libcrt/gdtoa/qnan.c with 100% similarity]
misc/src/libcrt/gdtoa/smisc.c [moved from src/libcrt/gdtoa/smisc.c with 100% similarity]
misc/src/libcrt/gdtoa/strtodg.c [moved from src/libcrt/gdtoa/strtodg.c with 100% similarity]
misc/src/libcrt/gdtoa/strtodnrp.c [moved from src/libcrt/gdtoa/strtodnrp.c with 100% similarity]
misc/src/libcrt/gdtoa/strtof.c [moved from src/libcrt/gdtoa/strtof.c with 100% similarity]
misc/src/libcrt/gdtoa/strtopx.c [moved from src/libcrt/gdtoa/strtopx.c with 100% similarity]
misc/src/libcrt/gdtoa/sum.c [moved from src/libcrt/gdtoa/sum.c with 100% similarity]
misc/src/libcrt/gdtoa/ulp.c [moved from src/libcrt/gdtoa/ulp.c with 100% similarity]
misc/src/libcrt/math/cbrt.c [moved from src/libcrt/math/cbrt.c with 100% similarity]
misc/src/libcrt/math/cbrtf.c [moved from src/libcrt/math/cbrtf.c with 100% similarity]
misc/src/libcrt/math/cbrtl.c [moved from src/libcrt/math/cbrtl.c with 100% similarity]
misc/src/libcrt/math/coshl.c [moved from src/libcrt/math/coshl.c with 100% similarity]
misc/src/libcrt/math/erfl.c [moved from src/libcrt/math/erfl.c with 100% similarity]
misc/src/libcrt/math/frexpl.S [moved from src/libcrt/math/frexpl.S with 100% similarity]
misc/src/libcrt/math/hypotl.c [moved from src/libcrt/math/hypotl.c with 100% similarity]
misc/src/libcrt/math/lgamma.c [moved from src/libcrt/math/lgamma.c with 100% similarity]
misc/src/libcrt/math/lgammaf.c [moved from src/libcrt/math/lgammaf.c with 100% similarity]
misc/src/libcrt/math/pow.c [moved from src/libcrt/math/pow.c with 100% similarity]
misc/src/libcrt/math/powi.c [moved from src/libcrt/math/powi.c with 100% similarity]
misc/src/libcrt/math/powif.c [moved from src/libcrt/math/powif.c with 100% similarity]
misc/src/libcrt/math/powil.c [moved from src/libcrt/math/powil.c with 100% similarity]
misc/src/libcrt/math/powl.c [moved from src/libcrt/math/powl.c with 100% similarity]
misc/src/libcrt/math/sinhl.c [moved from src/libcrt/math/sinhl.c with 100% similarity]
misc/src/libcrt/math/tanhl.c [moved from src/libcrt/math/tanhl.c with 100% similarity]
misc/src/libcrt/math/tgamma.c [moved from src/libcrt/math/tgamma.c with 100% similarity]
misc/src/libcrt/math/tgammaf.c [moved from src/libcrt/math/tgammaf.c with 100% similarity]
misc/src/libcrt/profile/gmon.c [moved from src/libcrt/profile/gmon.c with 100% similarity]
misc/src/libcrt/profile/gmon.h [moved from src/libcrt/profile/gmon.h with 100% similarity]
misc/src/libcrt/profile/mcount.c [moved from src/libcrt/profile/mcount.c with 100% similarity]
misc/src/libdinput/dinput_joy.c [moved from src/libdinput/dinput_joy.c with 100% similarity]
misc/src/libdinput/dinput_joy2.c [moved from src/libdinput/dinput_joy2.c with 100% similarity]
misc/src/libdinput/dinput_kbd.c [moved from src/libdinput/dinput_kbd.c with 100% similarity]
misc/src/libdinput/dinput_mouse.c [moved from src/libdinput/dinput_mouse.c with 100% similarity]
misc/src/libdinput/dinput_mouse2.c [moved from src/libdinput/dinput_mouse2.c with 100% similarity]
misc/src/libdinput/dinput_private.h [moved from src/libdinput/dinput_private.h with 100% similarity]
misc/src/libdmoguids/dmoguids.c [moved from src/libdmoguids/dmoguids.c with 100% similarity]
misc/src/libdxerr8/dxerr.c [moved from src/libdxerr8/dxerr.c with 100% similarity]
misc/src/libdxerr8/dxerr8.c [moved from src/libdxerr8/dxerr8.c with 100% similarity]
misc/src/libdxerr8/dxerr8w.c [moved from src/libdxerr8/dxerr8w.c with 100% similarity]
misc/src/libdxerr9/dxerr.c [moved from src/libdxerr9/dxerr.c with 100% similarity]
misc/src/libdxerr9/dxerr9.c [moved from src/libdxerr9/dxerr9.c with 100% similarity]
misc/src/libdxerr9/dxerr9w.c [moved from src/libdxerr9/dxerr9w.c with 100% similarity]
misc/src/libdxguid/dxguid.c [moved from src/libdxguid/dxguid.c with 100% similarity]
misc/src/libksuser/ksuser.c [moved from src/libksuser/ksuser.c with 100% similarity]
misc/src/libstrmiids/strmiids.c [moved from src/libstrmiids/strmiids.c with 100% similarity]

index ac4f646..620c76d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2012-09-05  Earnie Boyd  <earnie@users.sourceforge.net>
+
+       Segregate source that cannot take on the MinGW.org LICENSE.
+
+       * Makefile.in: Make changes based on moved files.
+       * gpl/*: Move to misc/gpl/*.
+       * include/GL/*: Move to misc/include/GL/*.
+       * src/libcrt/math/cephes_mconf.h: Move to 
+       misc/src/include/cephes_mconf.h.
+       * src/libcrt/include/gdtoa.h: Move to misc/src/include/gdtoa.h.
+       * src/libcrt/gdtoa/*: Move to misc/src/libcrt/gdtoa/*.
+       * src/libcrt/math/cbrt.c: Move to misc/src/libcrt/math/cbrt.c.
+       * src/libcrt/math/cbrtf.c: Move to misc/src/libcrt/math/cbrtf.c.
+       * src/libcrt/math/cbrtl.c: Move to misc/src/libcrt/math/cbrtl.c.
+       * src/libcrt/math/coshl.c: Move to misc/src/libcrt/math/coshl.c.
+       * src/libcrt/math/erfl.c: Move to misc/src/libcrt/math/erfl.c.
+       * src/libcrt/math/frexpl.S: Move to misc/src/libcrt/math/frexpl.S.
+       * src/libcrt/math/hypotl.c: Move to misc/src/libcrt/math/hypotl.c.
+       * src/libcrt/math/lgamma.c: Move to misc/src/libcrt/math/lgamma.c.
+       * src/libcrt/math/lgammaf.c: Move to misc/src/libcrt/math/lgammaf.c.
+       * src/libcrt/math/pow.c: Move to misc/src/libcrt/math/pow.c.
+       * src/libcrt/math/powi.c: Move to misc/src/libcrt/math/powi.c.
+       * src/libcrt/math/powif.c: Move to misc/src/libcrt/math/powif.c.
+       * src/libcrt/math/powil.c: Move to misc/src/libcrt/math/powil.c.
+       * src/libcrt/math/powl.c: Move to misc/src/libcrt/math/powl.c.
+       * src/libcrt/math/sinhl.c: Move to misc/src/libcrt/math/sinhl.c.
+       * src/libcrt/math/tanhl.c: Move to misc/src/libcrt/math/tanhl.c.
+       * src/libcrt/math/tgamma.c: Move to misc/src/libcrt/math/tgamma.c.
+       * src/libcrt/math/tgammaf.c: Move to misc/src/libcrt/math/tgammaf.c.
+       * src/libcrt/profile/*: Move to misc/src/libcrt/profile/*.
+       * src/libcrt/libdinput/*: Move to misc/src/libcrt/libdinput/*.
+       * src/libcrt/libdmoguids/*: Move to misc/src/libcrt/libdmoguids/*.
+       * src/libcrt/libdxerr8/*: Move to misc/src/libcrt/libdxerr8/*.
+       * src/libcrt/libdxerr9/*: Move to misc/src/libcrt/libdxerr9/*.
+       * src/libcrt/libdxguid/*: Move to misc/src/libcrt/libdxguid/*.
+       * src/libcrt/libksuser/*: Move to misc/src/libcrt/libksuser/*.
+       * src/libcrt/libstrmiids/*: Move to misc/src/libcrt/libstrmiids/*.
+
 2012-09-04  Earnie Boyd  <earnie@users.sourceforge.net>
 
        More on assuming GCC is greater than or equal to version 3.5.4 and that
index a77cdae..e40f790 100644 (file)
@@ -1,3 +1,9 @@
+##
+# @file Makefile.in
+# @copy 2012 MinGW.org project
+# @see LICENSE
+# http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=blob_plain;f=LICENSE/
+##
 VPATH=$(srcdir)
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
@@ -25,8 +31,8 @@ INSTALL=@INSTALL@
 MKDIR_P=@MKDIR_P@
 
 INCLUDES=-I$(top_srcdir)/include -I$(srcdir)/include \
-  -I$(top_srcdir)/src/libcrt/include -nostdinc \
-  -iwithprefixbefore include
+  -I$(top_srcdir)/src/libcrt/include -I$(top_srcdir)/misc/src/include \
+  -nostdinc -iwithprefixbefore include
 ALL_CFLAGS=$(CFLAGS) $(INCLUDES) -DNTDDI_VERSION=0x04000000
 
 .SUFFIXES: .def.in .def
@@ -75,7 +81,7 @@ winapi_lib_DDK_LIBRARIES := $(addprefix lib,$(winapi_DDK_DEF:.def=.a))
 winapi_lib_DIRECTX_LIBRARIES := $(addprefix lib,$(winapi_DIRECTX_DEF:.def=.a))
 winapi_lib_DIRECTX_DINPUT_LIBRARIES := $(addprefix lib,$(winapi_DIRECTX_DINPUT_DEF:.def=.a))
 winapi_mri_LIBRARIES := $(addprefix lib,$(winapi_MRI:.mri=.a))
-winapi_lib_EXTRA_LIBRARIES := libuuid.a libscrnsave.a libscrnsavw.a liblargeint.a libdmoguids.a libdxguid.a libstrmiids.a
+winapi_lib_EXTRA_LIBRARIES := libuuid.a libscrnsave.a libscrnsavw.a liblargeint.a libdmoguids.a libdxguid.a libdxerr8.a libdxerr9.a libstrmiids.a
 
 lib_LIBRARIES := $(mingwrt_lib_LIBRARIES) $(winapi_lib_LIBRARIES) \
   $(winapi_lib_EXTRA_LIBRARIES) $(winapi_mri_LIBRARIES) \
@@ -114,7 +120,7 @@ mold_SOURCES := \
   $(SRCDIR)/wscmpi.c
 mold_OBJECTS := $(mode_SOURCES:.c=.o)
 
-SRCDIR := gpl/profile
+SRCDIR := misc/gpl/profile
 gcrt0_SOURCES := $(SRCDIR)/gcrt0.c
 gcrt0_OBJECTS := $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o
 
@@ -138,13 +144,13 @@ scrnsavw_o_CFLAGS := -DUNICODE
 liblargeint_a_SOURCES := src/liblargeint/largeint.c
 liblargeint_a_OBJECTS := $(liblargeint_a_SOURCES:.c=.o)
 
-libdmoguids_a_SOURCES := src/libdmoguids/dmoguids.c
+libdmoguids_a_SOURCES := misc/src/libdmoguids/dmoguids.c
 libdmoguids_a_OBJECTS := $(libdmoguids_a_SOURCES:.c=.o)
 
-libdxguid_a_SOURCES := src/libdxguid/dxguid.c
+libdxguid_a_SOURCES := misc/src/libdxguid/dxguid.c
 libdxguid_a_OBJECTS := $(libdxguid_a_SOURCES:.c=.o)
 
-libstrmiids_a_SOURCES := src/libstrmiids/strmiids.c
+libstrmiids_a_SOURCES := misc/src/libstrmiids/strmiids.c
 libstrmiids_a_OBJECTS := $(libstrmiids_a_SOURCES:.c=.o)
 
 msvcrt_DEF = \
@@ -263,7 +269,7 @@ fenv_SOURCES := \
   $(SRCDIR)/feraiseexcept.c \
   $(SRCDIR)/fesetround.c
 
-SRCDIR := src/libcrt/gdtoa
+SRCDIR := misc/src/libcrt/gdtoa
 gdtoa_SOURCES := \
   $(SRCDIR)/g__fmt.c \
   $(SRCDIR)/gethex.c \
@@ -297,6 +303,7 @@ inttypes_SOURCES := \
   $(SRCDIR)/wcstoumax.c
 
 SRCDIR := src/libcrt/math
+MSRCDIR := misc/src/libcrt/math
 math_SOURCES := \
   $(SRCDIR)/acosf.c \
   $(SRCDIR)/acosh.c \
@@ -315,9 +322,9 @@ math_SOURCES := \
   $(SRCDIR)/atanhf.c \
   $(SRCDIR)/atanhl.c \
   $(SRCDIR)/atanl.c \
-  $(SRCDIR)/cbrt.c \
-  $(SRCDIR)/cbrtf.c \
-  $(SRCDIR)/cbrtl.c \
+  $(MSRCDIR)/cbrt.c \
+  $(MSRCDIR)/cbrtf.c \
+  $(MSRCDIR)/cbrtl.c \
   $(SRCDIR)/ceilf.S \
   $(SRCDIR)/ceill.S \
   $(SRCDIR)/copysign.S \
@@ -325,9 +332,9 @@ math_SOURCES := \
   $(SRCDIR)/copysignl.S \
   $(SRCDIR)/cosf.S \
   $(SRCDIR)/coshf.c \
-  $(SRCDIR)/coshl.c \
+  $(MSRCDIR)/coshl.c \
   $(SRCDIR)/cosl.S \
-  $(SRCDIR)/erfl.c \
+  $(MSRCDIR)/erfl.c \
   $(SRCDIR)/exp2.S \
   $(SRCDIR)/exp2f.S \
   $(SRCDIR)/exp2l.S \
@@ -362,10 +369,10 @@ math_SOURCES := \
   $(SRCDIR)/fpclassifyf.c \
   $(SRCDIR)/fpclassifyl.c \
   $(SRCDIR)/frexpf.c \
-  $(SRCDIR)/frexpl.S \
+  $(MSRCDIR)/frexpl.S \
   $(SRCDIR)/fucom.c \
   $(SRCDIR)/hypotf.c \
-  $(SRCDIR)/hypotl.c \
+  $(MSRCDIR)/hypotl.c \
   $(SRCDIR)/ilogb.S \
   $(SRCDIR)/ilogbf.S \
   $(SRCDIR)/ilogbl.S \
@@ -374,8 +381,8 @@ math_SOURCES := \
   $(SRCDIR)/isnanl.c \
   $(SRCDIR)/ldexpf.c \
   $(SRCDIR)/ldexpl.c \
-  $(SRCDIR)/lgamma.c \
-  $(SRCDIR)/lgammaf.c \
+  $(MSRCDIR)/lgamma.c \
+  $(MSRCDIR)/lgammaf.c \
   $(SRCDIR)/lgammal.c \
   $(SRCDIR)/llrint.c \
   $(SRCDIR)/llrintf.c \
@@ -406,12 +413,12 @@ math_SOURCES := \
   $(SRCDIR)/nextafterl.c \
   $(SRCDIR)/nexttoward.c \
   $(SRCDIR)/nexttowardf.c \
-  $(SRCDIR)/pow.c \
+  $(MSRCDIR)/pow.c \
   $(SRCDIR)/powf.c \
-  $(SRCDIR)/powi.c \
-  $(SRCDIR)/powif.c \
-  $(SRCDIR)/powil.c \
-  $(SRCDIR)/powl.c \
+  $(MSRCDIR)/powi.c \
+  $(MSRCDIR)/powif.c \
+  $(MSRCDIR)/powil.c \
+  $(MSRCDIR)/powl.c \
   $(SRCDIR)/remainder.S \
   $(SRCDIR)/remainderf.S \
   $(SRCDIR)/remainderl.S \
@@ -432,16 +439,16 @@ math_SOURCES := \
   $(SRCDIR)/signbitl.c \
   $(SRCDIR)/sinf.S \
   $(SRCDIR)/sinhf.c \
-  $(SRCDIR)/sinhl.c \
+  $(MSRCDIR)/sinhl.c \
   $(SRCDIR)/sinl.S \
   $(SRCDIR)/sqrtf.c \
   $(SRCDIR)/sqrtl.c \
   $(SRCDIR)/tanf.S \
   $(SRCDIR)/tanhf.c \
-  $(SRCDIR)/tanhl.c \
+  $(MSRCDIR)/tanhl.c \
   $(SRCDIR)/tanl.S \
-  $(SRCDIR)/tgamma.c \
-  $(SRCDIR)/tgammaf.c \
+  $(MSRCDIR)/tgamma.c \
+  $(MSRCDIR)/tgammaf.c \
   $(SRCDIR)/tgammal.c \
   $(SRCDIR)/trunc.c \
   $(SRCDIR)/truncf.c \
@@ -460,11 +467,11 @@ SRCDIR := src/libcrt/posix/unistd
 posix_unistd_SOURCES := $(SRCDIR)/ftruncate.c $(SRCDIR)/usleep.c
 posix_SOURCES := $(posix_libgen_SOURCES) $(posix_unistd_SOURCES)
 
-SRCDIR := src/libcrt/profile
+SRCDIR := misc/src/libcrt/profile
 profile_SOURCES := \
   $(SRCDIR)/gmon.c \
   $(SRCDIR)/mcount.c \
-  gpl/profile/profil.c \
+  misc/gpl/profile/profil.c \
 libgmon_a_SOURCES := $(profile_SOURCES)
 libgmon_a_OBJECTS := $(libgmon_a_SOURCES:.c=.o)
 
@@ -558,7 +565,7 @@ libmingwex_a_SOURCES := \
 libmingwex_a_OBJECTS := $(libmingwex_a_SOURCES:.c=.o)
 libmingwex_a_OBJECTS := $(libmingwex_a_OBJECTS:.S=.o)
 
-SRCDIR := src/libdinput
+SRCDIR := misc/src/libdinput
 libdinput_a_SOURCES := \
   $(SRCDIR)/dinput_joy.c \
   $(SRCDIR)/dinput_joy2.c \
@@ -567,11 +574,11 @@ libdinput_a_SOURCES := \
   $(SRCDIR)/dinput_mouse2.c
 libdinput_a_OBJECTS := $(libdinput_a_SOURCES:.c=.o)
 
-SRCDIR := src/libdxerr8
+SRCDIR := misc/src/libdxerr8
 libdxerr8_a_SOURCES := $(SRCDIR)/dxerr.c $(SRCDIR)/dxerr8.c $(SRCDIR)/dxerr8w.c
 libdxerr8_a_OBJECTS := $(libdxerr8_a_SOURCES:.c=.o)
 
-SRCDIR := src/libdxerr9
+SRCDIR := misc/src/libdxerr9
 libdxerr9_a_SOURCES := $(SRCDIR)/dxerr.c $(SRCDIR)/dxerr9.c $(SRCDIR)/dxerr9w.c
 libdxerr9_a_OBJECTS := $(libdxerr9_a_SOURCES:.c=.o)
 
@@ -686,7 +693,7 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
        $(MKDIR_P) $(@D)
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
-SRCDIR := gpl/profile
+SRCDIR := misc/gpl/profile
 $(SRCDIR)/gcrt1.o:
        mkdir -p $(@D)
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
@@ -787,7 +794,7 @@ mingwm10.dll: $(mingwm10_dll_OBJECTS) mingwthrd.def libmingwex.a
 
 clean:
        rm -f *.def *.s *.o *.dll *.a _libm_dummy.c stamp*
-       rm -rf .deps/ src/
+       rm -rf .deps/ src/ misc/
        cd tests && $(MAKE) $@
 
 distclean: clean
@@ -1064,7 +1071,7 @@ install-w32api: install-w32api-dirs
        for INC in $(addprefix $(top_srcdir)/include/gdiplus/,$(w32api_lib_GDIPLUS_INCLUDES)); do \
          $(INSTALL) $(INSTALL_FLAGS) $$INC $(DESTDIR)$(includedir)/gdiplus/ ; \
        done
-       for INC in $(addprefix $(top_srcdir)/include/GL/,$(w32api_lib_GL_INCLUDES)); do \
+       for INC in $(addprefix $(top_srcdir)/misc/include/GL/,$(w32api_lib_GL_INCLUDES)); do \
          $(INSTALL) $(INSTALL_FLAGS) $$INC $(DESTDIR)$(includedir)/GL/ ; \
        done
        for INC in $(addprefix $(top_srcdir)/include/directx/,$(w32api_lib_DIRECTX_INCLUDES)); do \
@@ -1143,7 +1150,7 @@ install-wsl: install-wsl-dirs
        for INC in $(addprefix $(top_srcdir)/include/gdiplus/,$(w32api_lib_GDIPLUS_INCLUDES)); do \
          $(INSTALL) $(INSTALL_FLAGS) $$INC $(DESTDIR)$(includedir)/gdiplus/ ; \
        done
-       for INC in $(addprefix $(top_srcdir)/include/GL/,$(w32api_lib_GL_INCLUDES)); do \
+       for INC in $(addprefix $(top_srcdir)/misc/include/GL/,$(w32api_lib_GL_INCLUDES)); do \
          $(INSTALL) $(INSTALL_FLAGS) $$INC $(DESTDIR)$(includedir)/GL/ ; \
        done
        for INC in $(addprefix $(top_srcdir)/include/directx/,$(w32api_lib_DIRECTX_INCLUDES)); do \
similarity index 100%
rename from gpl/profile/COPYING
rename to misc/gpl/profile/COPYING
similarity index 100%
rename from gpl/profile/gcrt0.c
rename to misc/gpl/profile/gcrt0.c
similarity index 100%
rename from include/GL/gl.h
rename to misc/include/GL/gl.h
similarity index 100%
rename from include/GL/glext.h
rename to misc/include/GL/glext.h
similarity index 100%
rename from include/GL/glu.h
rename to misc/include/GL/glu.h