Move simgear/sky/ -> simgear/scene/sky/ as part of the consolidation of

graphics code.

diff --git a/configure.ac b/configure.ac
index 2136625ba2dc490f6d0bdeb4a4733d8b32e79e47..6bc57e61e1197e981ffd0079b17ba107c35fd00d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -420,11 +420,11 @@ AC_CONFIG_FILES([ \
        simgear/scene/Makefile \
        simgear/scene/material/Makefile \
        simgear/scene/model/Makefile \
+       simgear/scene/sky/Makefile \
+       simgear/scene/sky/clouds3d/Makefile \
        simgear/scene/tgdb/Makefile \
        simgear/screen/Makefile \
        simgear/serial/Makefile \
-       simgear/sky/Makefile \
-       simgear/sky/clouds3d/Makefile \
        simgear/sound/Makefile \
        simgear/threads/Makefile \
        simgear/timing/Makefile \

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 77b86ed3e70bb5d6dca9e17c5a34a9cca3b9c0d9..99e8d6016ce6a0090df1e70c0daeaf94b4cde235 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = \
        scene \
        screen \
        serial \
-       sky \
        sound \
        $(SGTHREAD_DIR) \
        timing \

diff --git a/simgear/scene/Makefile.am b/simgear/scene/Makefile.am
index 21e3b2953a1f6eabcea74fe297dc1c8041307f5e..c6aed399cce64b52da94e2a72cabc4e74e84021d 100644 (file)
--- a/simgear/scene/Makefile.am
+++ b/simgear/scene/Makefile.am
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene
 
-SUBDIRS = material model tgdb
+SUBDIRS = material model sky tgdb
 
 # lib_LIBRARIES = libsgscene.a
 

diff --git a/simgear/scene/sky/Makefile.am b/simgear/scene/sky/Makefile.am
index c2364339ea7eb581a0a3176f711053de24ae6d06..9ff4cf7eadd30edce127c21b7c24f1f6e761b4d0 100644 (file)
--- a/simgear/scene/sky/Makefile.am
+++ b/simgear/scene/sky/Makefile.am
@@ -1,4 +1,4 @@
-includedir = @includedir@/sky
+includedir = @includedir@/scene/sky
 
 # SUBDIRS = clouds3d
 

diff --git a/simgear/scene/sky/sky.hxx b/simgear/scene/sky/sky.hxx
index 7ddb440a4714dc3186c1084e06623598c93d84d5..46d69cda06fd93c53b4607f76ad629883e10f974 100644 (file)
--- a/simgear/scene/sky/sky.hxx
+++ b/simgear/scene/sky/sky.hxx
@@ -42,11 +42,11 @@
 
 #include <vector>
 
-#include <simgear/sky/cloud.hxx>
-#include <simgear/sky/dome.hxx>
-#include <simgear/sky/moon.hxx>
-#include <simgear/sky/oursun.hxx>
-#include <simgear/sky/stars.hxx>
+#include <simgear/scene/sky/cloud.hxx>
+#include <simgear/scene/sky/dome.hxx>
+#include <simgear/scene/sky/moon.hxx>
+#include <simgear/scene/sky/oursun.hxx>
+#include <simgear/scene/sky/stars.hxx>
 
 SG_USING_STD(vector);