GNOME.org
 

[f-spot] Move Tao to lib/

commit fefb7f3b8f8b71d5d9f9a47de8b075b590c96684
Author: Ruben Vermeersch <ruben savanne be>
Date:   Wed Jul 15 16:04:04 2009 +0200

    Move Tao to lib/

 Makefile.am                                        |    2 --
 Makefile.include                                   |    8 ++++----
 configure.ac                                       |   10 +++++-----
 lib/Makefile.am                                    |    3 ++-
 {Tao => lib/Tao}/.gitignore                        |    0
 {Tao => lib/Tao}/COPYING                           |    0
 {Tao => lib/Tao}/Makefile.am                       |    0
 {Tao => lib/Tao}/Tao.GlPostProcess/.gitignore      |    0
 {Tao => lib/Tao}/Tao.GlPostProcess/AssemblyInfo.cs |    0
 .../Tao}/Tao.GlPostProcess/GlPostProcess.cs        |    0
 {Tao => lib/Tao}/Tao.GlPostProcess/Makefile.am     |    0
 .../Tao}/Tao.GlPostProcess/Tao.GlPostProcess.snk   |  Bin 596 -> 596 bytes
 .../Tao}/Tao.OpenGl.ExtensionLoader/.gitignore     |    0
 .../Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs     |    0
 .../GlExtensionLoader.cs                           |    0
 .../Tao}/Tao.OpenGl.ExtensionLoader/Makefile.am    |    0
 .../Tao.OpenGl.ExtensionLoader.dll.config          |    0
 .../Tao.OpenGl.ExtensionLoader.snk                 |  Bin 596 -> 596 bytes
 {Tao => lib/Tao}/Tao.OpenGl.Glu/.gitignore         |    0
 {Tao => lib/Tao}/Tao.OpenGl.Glu/AssemblyInfo.cs    |    0
 {Tao => lib/Tao}/Tao.OpenGl.Glu/Glu.cs             |    0
 {Tao => lib/Tao}/Tao.OpenGl.Glu/Makefile.am        |    0
 .../Tao}/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config  |    0
 {Tao => lib/Tao}/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk |  Bin 596 -> 596 bytes
 {Tao => lib/Tao}/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml |    0
 {Tao => lib/Tao}/Tao.OpenGl/.gitignore             |    0
 {Tao => lib/Tao}/Tao.OpenGl/AssemblyInfo.cs        |    0
 {Tao => lib/Tao}/Tao.OpenGl/ContextGl.cs           |    0
 {Tao => lib/Tao}/Tao.OpenGl/Gl.cs                  |    0
 {Tao => lib/Tao}/Tao.OpenGl/Makefile.am            |    0
 {Tao => lib/Tao}/Tao.OpenGl/Tao.OpenGl.dll.config  |    0
 {Tao => lib/Tao}/Tao.OpenGl/Tao.OpenGl.snk         |  Bin 596 -> 596 bytes
 src/f-spot.in                                      |    2 +-
 33 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 64c35f9..320131e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ SUBDIRS = 		\
 	libjpegtran	\
 	libfspot	\
 	libgphoto2-sharp \
-	Tao		\
 	tools		\
 	po		\
 	src		\
@@ -31,7 +30,6 @@ DIST_SUBDIRS = 		\
 	libjpegtran	\
 	libfspot	\
 	libgphoto2-sharp \
-	Tao		\
 	tools		\
 	po		\
 	src		\
diff --git a/Makefile.include b/Makefile.include
index 44050de..8b75a03 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -16,10 +16,10 @@ DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
 DIR_LIBFSPOT = $(top_builddir)/libfspot
 DIR_SEMWEB = $(top_builddir)/lib/semweb
 DIR_SRC = $(top_builddir)/src
-DIR_TAO_OPENGL = $(top_builddir)/Tao/Tao.OpenGl
-DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
-DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
-DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
+DIR_TAO_OPENGL = $(top_builddir)/lib/Tao/Tao.OpenGl
+DIR_TAO_GLU = $(top_builddir)/lib/Tao/Tao.OpenGl.Glu
+DIR_TAO_EXTENSIONLOADER = $(top_builddir)/lib/Tao/Tao.OpenGl.ExtensionLoader
+DIR_TAO_GLPOSTPROCESS = $(top_builddir)/lib/Tao/Tao.GlPostProcess
 DIR_GIOSHARP = $(top_builddir)/gio-sharp/gio
 DIR_GTKSHARPBEANS = $(top_builddir)/gtk-sharp-beans
 
diff --git a/configure.ac b/configure.ac
index dcb517e..3e777ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,6 +292,11 @@ lib/mono-addins/Mono.Addins.Gui/Makefile
 lib/mono-addins/Mono.Addins/Makefile
 lib/mono-addins/Mono.Addins.Setup/Makefile
 lib/semweb/Makefile
+lib/Tao/Makefile
+lib/Tao/Tao.GlPostProcess/Makefile
+lib/Tao/Tao.OpenGl.ExtensionLoader/Makefile
+lib/Tao/Tao.OpenGl.Glu/Makefile
+lib/Tao/Tao.OpenGl/Makefile
 dbus-sharp/Makefile
 dbus-sharp-glib/Makefile
 dpap-sharp/Makefile
@@ -314,11 +319,6 @@ src/f-spot.exe.config
 src/Cms.dll.config
 src/FSpot.Widgets.dll.config
 src/Makefile
-Tao/Makefile
-Tao/Tao.OpenGl/Makefile
-Tao/Tao.OpenGl.Glu/Makefile
-Tao/Tao.GlPostProcess/Makefile
-Tao/Tao.OpenGl.ExtensionLoader/Makefile
 extensions/Makefile
 extensions/Exporters/Makefile
 extensions/Exporters/CDExport/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b65d2fa..d97fc58 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,4 +3,5 @@ SUBDIRS = 				\
 	glitz-sharp 		\
 	libfspotraw 		\
 	mono-addins			\
-	semweb
+	semweb 				\
+	Tao
diff --git a/Tao/.gitignore b/lib/Tao/.gitignore
similarity index 100%
rename from Tao/.gitignore
rename to lib/Tao/.gitignore
diff --git a/Tao/COPYING b/lib/Tao/COPYING
similarity index 100%
rename from Tao/COPYING
rename to lib/Tao/COPYING
diff --git a/Tao/Makefile.am b/lib/Tao/Makefile.am
similarity index 100%
rename from Tao/Makefile.am
rename to lib/Tao/Makefile.am
diff --git a/Tao/Tao.GlPostProcess/.gitignore b/lib/Tao/Tao.GlPostProcess/.gitignore
similarity index 100%
rename from Tao/Tao.GlPostProcess/.gitignore
rename to lib/Tao/Tao.GlPostProcess/.gitignore
diff --git a/Tao/Tao.GlPostProcess/AssemblyInfo.cs b/lib/Tao/Tao.GlPostProcess/AssemblyInfo.cs
similarity index 100%
rename from Tao/Tao.GlPostProcess/AssemblyInfo.cs
rename to lib/Tao/Tao.GlPostProcess/AssemblyInfo.cs
diff --git a/Tao/Tao.GlPostProcess/GlPostProcess.cs b/lib/Tao/Tao.GlPostProcess/GlPostProcess.cs
similarity index 100%
rename from Tao/Tao.GlPostProcess/GlPostProcess.cs
rename to lib/Tao/Tao.GlPostProcess/GlPostProcess.cs
diff --git a/Tao/Tao.GlPostProcess/Makefile.am b/lib/Tao/Tao.GlPostProcess/Makefile.am
similarity index 100%
rename from Tao/Tao.GlPostProcess/Makefile.am
rename to lib/Tao/Tao.GlPostProcess/Makefile.am
diff --git a/Tao/Tao.GlPostProcess/Tao.GlPostProcess.snk b/lib/Tao/Tao.GlPostProcess/Tao.GlPostProcess.snk
similarity index 100%
rename from Tao/Tao.GlPostProcess/Tao.GlPostProcess.snk
rename to lib/Tao/Tao.GlPostProcess/Tao.GlPostProcess.snk
diff --git a/Tao/Tao.OpenGl.ExtensionLoader/.gitignore b/lib/Tao/Tao.OpenGl.ExtensionLoader/.gitignore
similarity index 100%
rename from Tao/Tao.OpenGl.ExtensionLoader/.gitignore
rename to lib/Tao/Tao.OpenGl.ExtensionLoader/.gitignore
diff --git a/Tao/Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs b/lib/Tao/Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs
similarity index 100%
rename from Tao/Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs
rename to lib/Tao/Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs
diff --git a/Tao/Tao.OpenGl.ExtensionLoader/GlExtensionLoader.cs b/lib/Tao/Tao.OpenGl.ExtensionLoader/GlExtensionLoader.cs
similarity index 100%
rename from Tao/Tao.OpenGl.ExtensionLoader/GlExtensionLoader.cs
rename to lib/Tao/Tao.OpenGl.ExtensionLoader/GlExtensionLoader.cs
diff --git a/Tao/Tao.OpenGl.ExtensionLoader/Makefile.am b/lib/Tao/Tao.OpenGl.ExtensionLoader/Makefile.am
similarity index 100%
rename from Tao/Tao.OpenGl.ExtensionLoader/Makefile.am
rename to lib/Tao/Tao.OpenGl.ExtensionLoader/Makefile.am
diff --git a/Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.dll.config b/lib/Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.dll.config
similarity index 100%
rename from Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.dll.config
rename to lib/Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.dll.config
diff --git a/Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.snk b/lib/Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.snk
similarity index 100%
rename from Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.snk
rename to lib/Tao/Tao.OpenGl.ExtensionLoader/Tao.OpenGl.ExtensionLoader.snk
diff --git a/Tao/Tao.OpenGl.Glu/.gitignore b/lib/Tao/Tao.OpenGl.Glu/.gitignore
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/.gitignore
rename to lib/Tao/Tao.OpenGl.Glu/.gitignore
diff --git a/Tao/Tao.OpenGl.Glu/AssemblyInfo.cs b/lib/Tao/Tao.OpenGl.Glu/AssemblyInfo.cs
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/AssemblyInfo.cs
rename to lib/Tao/Tao.OpenGl.Glu/AssemblyInfo.cs
diff --git a/Tao/Tao.OpenGl.Glu/Glu.cs b/lib/Tao/Tao.OpenGl.Glu/Glu.cs
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/Glu.cs
rename to lib/Tao/Tao.OpenGl.Glu/Glu.cs
diff --git a/Tao/Tao.OpenGl.Glu/Makefile.am b/lib/Tao/Tao.OpenGl.Glu/Makefile.am
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/Makefile.am
rename to lib/Tao/Tao.OpenGl.Glu/Makefile.am
diff --git a/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config b/lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config
rename to lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config
diff --git a/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk b/lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk
rename to lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk
diff --git a/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml b/lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml
similarity index 100%
rename from Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml
rename to lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml
diff --git a/Tao/Tao.OpenGl/.gitignore b/lib/Tao/Tao.OpenGl/.gitignore
similarity index 100%
rename from Tao/Tao.OpenGl/.gitignore
rename to lib/Tao/Tao.OpenGl/.gitignore
diff --git a/Tao/Tao.OpenGl/AssemblyInfo.cs b/lib/Tao/Tao.OpenGl/AssemblyInfo.cs
similarity index 100%
rename from Tao/Tao.OpenGl/AssemblyInfo.cs
rename to lib/Tao/Tao.OpenGl/AssemblyInfo.cs
diff --git a/Tao/Tao.OpenGl/ContextGl.cs b/lib/Tao/Tao.OpenGl/ContextGl.cs
similarity index 100%
rename from Tao/Tao.OpenGl/ContextGl.cs
rename to lib/Tao/Tao.OpenGl/ContextGl.cs
diff --git a/Tao/Tao.OpenGl/Gl.cs b/lib/Tao/Tao.OpenGl/Gl.cs
similarity index 100%
rename from Tao/Tao.OpenGl/Gl.cs
rename to lib/Tao/Tao.OpenGl/Gl.cs
diff --git a/Tao/Tao.OpenGl/Makefile.am b/lib/Tao/Tao.OpenGl/Makefile.am
similarity index 100%
rename from Tao/Tao.OpenGl/Makefile.am
rename to lib/Tao/Tao.OpenGl/Makefile.am
diff --git a/Tao/Tao.OpenGl/Tao.OpenGl.dll.config b/lib/Tao/Tao.OpenGl/Tao.OpenGl.dll.config
similarity index 100%
rename from Tao/Tao.OpenGl/Tao.OpenGl.dll.config
rename to lib/Tao/Tao.OpenGl/Tao.OpenGl.dll.config
diff --git a/Tao/Tao.OpenGl/Tao.OpenGl.snk b/lib/Tao/Tao.OpenGl/Tao.OpenGl.snk
similarity index 100%
rename from Tao/Tao.OpenGl/Tao.OpenGl.snk
rename to lib/Tao/Tao.OpenGl/Tao.OpenGl.snk
diff --git a/src/f-spot.in b/src/f-spot.in
index 31795ec..9a1ddc4 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -60,7 +60,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]