GNOME.org
 

[f-spot] Move gio-sharp to lib/

commit f56890372f9fcabf257a3efc690a2fdbac29acc2
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat Jul 18 00:04:28 2009 +0200

    Move gio-sharp to lib/

 Makefile.am                                        |    1 -
 Makefile.include                                   |    2 +-
 configure.ac                                       |    6 +++---
 extensions/Tools/MetaPixel/Makefile                |    2 +-
 extensions/Tools/PictureTile/Makefile              |    2 +-
 lib/Makefile.am                                    |    1 +
 {gio-sharp => lib/gio-sharp}/.gitignore            |    0
 {gio-sharp => lib/gio-sharp}/Makefile.am           |    0
 {gio-sharp => lib/gio-sharp}/generator/AliasGen.cs |    0
 {gio-sharp => lib/gio-sharp}/generator/BoxedGen.cs |    0
 {gio-sharp => lib/gio-sharp}/generator/ByRefGen.cs |    0
 .../gio-sharp}/generator/CallbackGen.cs            |    0
 .../gio-sharp}/generator/ChildProperty.cs          |    0
 .../gio-sharp}/generator/ClassBase.cs              |    0
 {gio-sharp => lib/gio-sharp}/generator/ClassGen.cs |    0
 .../gio-sharp}/generator/CodeGenerator.cs          |    0
 .../gio-sharp}/generator/ConstFilenameGen.cs       |    0
 .../gio-sharp}/generator/ConstStringGen.cs         |    0
 {gio-sharp => lib/gio-sharp}/generator/Ctor.cs     |    0
 {gio-sharp => lib/gio-sharp}/generator/EnumGen.cs  |    0
 .../gio-sharp}/generator/FieldBase.cs              |    0
 {gio-sharp => lib/gio-sharp}/generator/GenBase.cs  |    0
 .../gio-sharp}/generator/GenerationInfo.cs         |    0
 .../gio-sharp}/generator/HandleBase.cs             |    0
 .../gio-sharp}/generator/IAccessor.cs              |    0
 .../gio-sharp}/generator/IGeneratable.cs           |    0
 .../gio-sharp}/generator/IManualMarshaler.cs       |    0
 .../gio-sharp}/generator/InterfaceGen.cs           |    0
 {gio-sharp => lib/gio-sharp}/generator/LPGen.cs    |    0
 {gio-sharp => lib/gio-sharp}/generator/LPUGen.cs   |    0
 {gio-sharp => lib/gio-sharp}/generator/Makefile.am |    2 +-
 .../gio-sharp}/generator/ManagedCallString.cs      |    0
 .../gio-sharp}/generator/ManualGen.cs              |    0
 .../gio-sharp}/generator/MarshalGen.cs             |    0
 {gio-sharp => lib/gio-sharp}/generator/Method.cs   |    0
 .../gio-sharp}/generator/MethodBase.cs             |    0
 .../gio-sharp}/generator/MethodBody.cs             |    0
 .../gio-sharp}/generator/ObjectBase.cs             |    0
 .../gio-sharp}/generator/ObjectField.cs            |    0
 .../gio-sharp}/generator/ObjectGen.cs              |    0
 .../gio-sharp}/generator/OpaqueGen.cs              |    0
 .../gio-sharp}/generator/Parameters.cs             |    0
 {gio-sharp => lib/gio-sharp}/generator/Parser.cs   |    0
 {gio-sharp => lib/gio-sharp}/generator/Property.cs |    0
 .../gio-sharp}/generator/PropertyBase.cs           |    0
 .../gio-sharp}/generator/ReturnValue.cs            |    0
 {gio-sharp => lib/gio-sharp}/generator/Signal.cs   |    0
 .../gio-sharp}/generator/Signature.cs              |    0
 .../gio-sharp}/generator/SimpleBase.cs             |    0
 .../gio-sharp}/generator/SimpleGen.cs              |    0
 .../gio-sharp}/generator/Statistics.cs             |    0
 .../gio-sharp}/generator/StructBase.cs             |    0
 .../gio-sharp}/generator/StructField.cs            |    0
 .../gio-sharp}/generator/StructGen.cs              |    0
 .../gio-sharp}/generator/SymbolTable.cs            |    0
 .../gio-sharp}/generator/VMSignature.cs            |    0
 .../gio-sharp}/generator/VirtualMethod.cs          |    0
 .../gio-sharp}/gio/AppInfoAdapter.custom           |    0
 {gio-sharp => lib/gio-sharp}/gio/AssemblyInfo.cs   |    0
 {gio-sharp => lib/gio-sharp}/gio/File.custom       |    0
 .../gio-sharp}/gio/FileAdapter.custom              |    0
 .../gio-sharp}/gio/FileEnumerator.custom           |    0
 {gio-sharp => lib/gio-sharp}/gio/FileFactory.cs    |    0
 {gio-sharp => lib/gio-sharp}/gio/Gio.metadata      |    0
 {gio-sharp => lib/gio-sharp}/gio/GioStream.cs      |    0
 {gio-sharp => lib/gio-sharp}/gio/Makefile.am       |    6 +++---
 {gio-sharp => lib/gio-sharp}/gio/gio-api.raw       |    0
 .../gio-sharp}/gio/gio-sharp.dll.config            |    0
 {gio-sharp => lib/gio-sharp}/gio/snk               |  Bin 596 -> 596 bytes
 src/f-spot.in                                      |    2 +-
 tests/src/Makefile.am                              |    2 +-
 71 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 19e1800..cc83c3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ SUBDIRS = 		\
 
 DIST_SUBDIRS = 		\
 	lib 		\
-	gio-sharp	\
 	dbus-sharp	\
 	dbus-sharp-glib	\
 	dpap-sharp	\
diff --git a/Makefile.include b/Makefile.include
index fadcbb0..efd6d72 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -20,7 +20,7 @@ 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_GIOSHARP = $(top_builddir)/lib/gio-sharp/gio
 DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 
 ## Links
diff --git a/configure.ac b/configure.ac
index 9ba2918..10d3370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,6 +283,9 @@ AC_SUBST(GNOME_ICON_THEME_PREFIX)
 AC_OUTPUT(
 Makefile
 lib/GKeyFile/Makefile
+lib/gio-sharp/Makefile
+lib/gio-sharp/gio/Makefile
+lib/gio-sharp/generator/Makefile
 lib/glitz-sharp/Makefile
 lib/glitz-sharp/src/Makefile
 lib/gnome-keyring-sharp/Makefile
@@ -352,7 +355,4 @@ f-spot.spec
 f-spot.desktop.in
 f-spot-view.desktop.in
 f-spot-import.desktop.in
-gio-sharp/Makefile
-gio-sharp/gio/Makefile
-gio-sharp/generator/Makefile
 )
diff --git a/extensions/Tools/MetaPixel/Makefile b/extensions/Tools/MetaPixel/Makefile
index 2625977..0cff7f0 100644
--- a/extensions/Tools/MetaPixel/Makefile
+++ b/extensions/Tools/MetaPixel/Makefile
@@ -6,7 +6,7 @@ PACKAGES = \
 	-pkg:glade-sharp-2.0
 
 ASSEMBLIES = \
-	-r:../../../gio-sharp/gio/gio-sharp.dll \
+	-r:../../../lib/gio-sharp/gio/gio-sharp.dll \
 	-r:Mono.Posix
 
 RESOURCES = \
diff --git a/extensions/Tools/PictureTile/Makefile b/extensions/Tools/PictureTile/Makefile
index 2fdef86..713e4df 100644
--- a/extensions/Tools/PictureTile/Makefile
+++ b/extensions/Tools/PictureTile/Makefile
@@ -6,7 +6,7 @@ PACKAGES = \
 	-pkg:glade-sharp-2.0
 
 ASSEMBLIES = \
-	-r:../../../gio-sharp/gio/gio-sharp.dll \
+	-r:../../../lib/gio-sharp/gio/gio-sharp.dll \
 	-r:Mono.Posix
 
 RESOURCES = \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 13bbc97..a04716f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,6 +3,7 @@
 
 SUBDIRS = 				\
 	GKeyFile 			\
+	gio-sharp			\
 	glitz-sharp			\
 	gnome-keyring-sharp	\
 	gtk-sharp-beans		\
diff --git a/gio-sharp/.gitignore b/lib/gio-sharp/.gitignore
similarity index 100%
rename from gio-sharp/.gitignore
rename to lib/gio-sharp/.gitignore
diff --git a/gio-sharp/Makefile.am b/lib/gio-sharp/Makefile.am
similarity index 100%
rename from gio-sharp/Makefile.am
rename to lib/gio-sharp/Makefile.am
diff --git a/gio-sharp/generator/AliasGen.cs b/lib/gio-sharp/generator/AliasGen.cs
similarity index 100%
rename from gio-sharp/generator/AliasGen.cs
rename to lib/gio-sharp/generator/AliasGen.cs
diff --git a/gio-sharp/generator/BoxedGen.cs b/lib/gio-sharp/generator/BoxedGen.cs
similarity index 100%
rename from gio-sharp/generator/BoxedGen.cs
rename to lib/gio-sharp/generator/BoxedGen.cs
diff --git a/gio-sharp/generator/ByRefGen.cs b/lib/gio-sharp/generator/ByRefGen.cs
similarity index 100%
rename from gio-sharp/generator/ByRefGen.cs
rename to lib/gio-sharp/generator/ByRefGen.cs
diff --git a/gio-sharp/generator/CallbackGen.cs b/lib/gio-sharp/generator/CallbackGen.cs
similarity index 100%
rename from gio-sharp/generator/CallbackGen.cs
rename to lib/gio-sharp/generator/CallbackGen.cs
diff --git a/gio-sharp/generator/ChildProperty.cs b/lib/gio-sharp/generator/ChildProperty.cs
similarity index 100%
rename from gio-sharp/generator/ChildProperty.cs
rename to lib/gio-sharp/generator/ChildProperty.cs
diff --git a/gio-sharp/generator/ClassBase.cs b/lib/gio-sharp/generator/ClassBase.cs
similarity index 100%
rename from gio-sharp/generator/ClassBase.cs
rename to lib/gio-sharp/generator/ClassBase.cs
diff --git a/gio-sharp/generator/ClassGen.cs b/lib/gio-sharp/generator/ClassGen.cs
similarity index 100%
rename from gio-sharp/generator/ClassGen.cs
rename to lib/gio-sharp/generator/ClassGen.cs
diff --git a/gio-sharp/generator/CodeGenerator.cs b/lib/gio-sharp/generator/CodeGenerator.cs
similarity index 100%
rename from gio-sharp/generator/CodeGenerator.cs
rename to lib/gio-sharp/generator/CodeGenerator.cs
diff --git a/gio-sharp/generator/ConstFilenameGen.cs b/lib/gio-sharp/generator/ConstFilenameGen.cs
similarity index 100%
rename from gio-sharp/generator/ConstFilenameGen.cs
rename to lib/gio-sharp/generator/ConstFilenameGen.cs
diff --git a/gio-sharp/generator/ConstStringGen.cs b/lib/gio-sharp/generator/ConstStringGen.cs
similarity index 100%
rename from gio-sharp/generator/ConstStringGen.cs
rename to lib/gio-sharp/generator/ConstStringGen.cs
diff --git a/gio-sharp/generator/Ctor.cs b/lib/gio-sharp/generator/Ctor.cs
similarity index 100%
rename from gio-sharp/generator/Ctor.cs
rename to lib/gio-sharp/generator/Ctor.cs
diff --git a/gio-sharp/generator/EnumGen.cs b/lib/gio-sharp/generator/EnumGen.cs
similarity index 100%
rename from gio-sharp/generator/EnumGen.cs
rename to lib/gio-sharp/generator/EnumGen.cs
diff --git a/gio-sharp/generator/FieldBase.cs b/lib/gio-sharp/generator/FieldBase.cs
similarity index 100%
rename from gio-sharp/generator/FieldBase.cs
rename to lib/gio-sharp/generator/FieldBase.cs
diff --git a/gio-sharp/generator/GenBase.cs b/lib/gio-sharp/generator/GenBase.cs
similarity index 100%
rename from gio-sharp/generator/GenBase.cs
rename to lib/gio-sharp/generator/GenBase.cs
diff --git a/gio-sharp/generator/GenerationInfo.cs b/lib/gio-sharp/generator/GenerationInfo.cs
similarity index 100%
rename from gio-sharp/generator/GenerationInfo.cs
rename to lib/gio-sharp/generator/GenerationInfo.cs
diff --git a/gio-sharp/generator/HandleBase.cs b/lib/gio-sharp/generator/HandleBase.cs
similarity index 100%
rename from gio-sharp/generator/HandleBase.cs
rename to lib/gio-sharp/generator/HandleBase.cs
diff --git a/gio-sharp/generator/IAccessor.cs b/lib/gio-sharp/generator/IAccessor.cs
similarity index 100%
rename from gio-sharp/generator/IAccessor.cs
rename to lib/gio-sharp/generator/IAccessor.cs
diff --git a/gio-sharp/generator/IGeneratable.cs b/lib/gio-sharp/generator/IGeneratable.cs
similarity index 100%
rename from gio-sharp/generator/IGeneratable.cs
rename to lib/gio-sharp/generator/IGeneratable.cs
diff --git a/gio-sharp/generator/IManualMarshaler.cs b/lib/gio-sharp/generator/IManualMarshaler.cs
similarity index 100%
rename from gio-sharp/generator/IManualMarshaler.cs
rename to lib/gio-sharp/generator/IManualMarshaler.cs
diff --git a/gio-sharp/generator/InterfaceGen.cs b/lib/gio-sharp/generator/InterfaceGen.cs
similarity index 100%
rename from gio-sharp/generator/InterfaceGen.cs
rename to lib/gio-sharp/generator/InterfaceGen.cs
diff --git a/gio-sharp/generator/LPGen.cs b/lib/gio-sharp/generator/LPGen.cs
similarity index 100%
rename from gio-sharp/generator/LPGen.cs
rename to lib/gio-sharp/generator/LPGen.cs
diff --git a/gio-sharp/generator/LPUGen.cs b/lib/gio-sharp/generator/LPUGen.cs
similarity index 100%
rename from gio-sharp/generator/LPUGen.cs
rename to lib/gio-sharp/generator/LPUGen.cs
diff --git a/gio-sharp/generator/Makefile.am b/lib/gio-sharp/generator/Makefile.am
similarity index 96%
rename from gio-sharp/generator/Makefile.am
rename to lib/gio-sharp/generator/Makefile.am
index 548cc25..3ad5532 100644
--- a/gio-sharp/generator/Makefile.am
+++ b/lib/gio-sharp/generator/Makefile.am
@@ -1,4 +1,4 @@
-include ../../Makefile.include
+include $(top_srcdir)/Makefile.include
 
 CLEANFILES =				\
 	gapi_codegen.exe		\
diff --git a/gio-sharp/generator/ManagedCallString.cs b/lib/gio-sharp/generator/ManagedCallString.cs
similarity index 100%
rename from gio-sharp/generator/ManagedCallString.cs
rename to lib/gio-sharp/generator/ManagedCallString.cs
diff --git a/gio-sharp/generator/ManualGen.cs b/lib/gio-sharp/generator/ManualGen.cs
similarity index 100%
rename from gio-sharp/generator/ManualGen.cs
rename to lib/gio-sharp/generator/ManualGen.cs
diff --git a/gio-sharp/generator/MarshalGen.cs b/lib/gio-sharp/generator/MarshalGen.cs
similarity index 100%
rename from gio-sharp/generator/MarshalGen.cs
rename to lib/gio-sharp/generator/MarshalGen.cs
diff --git a/gio-sharp/generator/Method.cs b/lib/gio-sharp/generator/Method.cs
similarity index 100%
rename from gio-sharp/generator/Method.cs
rename to lib/gio-sharp/generator/Method.cs
diff --git a/gio-sharp/generator/MethodBase.cs b/lib/gio-sharp/generator/MethodBase.cs
similarity index 100%
rename from gio-sharp/generator/MethodBase.cs
rename to lib/gio-sharp/generator/MethodBase.cs
diff --git a/gio-sharp/generator/MethodBody.cs b/lib/gio-sharp/generator/MethodBody.cs
similarity index 100%
rename from gio-sharp/generator/MethodBody.cs
rename to lib/gio-sharp/generator/MethodBody.cs
diff --git a/gio-sharp/generator/ObjectBase.cs b/lib/gio-sharp/generator/ObjectBase.cs
similarity index 100%
rename from gio-sharp/generator/ObjectBase.cs
rename to lib/gio-sharp/generator/ObjectBase.cs
diff --git a/gio-sharp/generator/ObjectField.cs b/lib/gio-sharp/generator/ObjectField.cs
similarity index 100%
rename from gio-sharp/generator/ObjectField.cs
rename to lib/gio-sharp/generator/ObjectField.cs
diff --git a/gio-sharp/generator/ObjectGen.cs b/lib/gio-sharp/generator/ObjectGen.cs
similarity index 100%
rename from gio-sharp/generator/ObjectGen.cs
rename to lib/gio-sharp/generator/ObjectGen.cs
diff --git a/gio-sharp/generator/OpaqueGen.cs b/lib/gio-sharp/generator/OpaqueGen.cs
similarity index 100%
rename from gio-sharp/generator/OpaqueGen.cs
rename to lib/gio-sharp/generator/OpaqueGen.cs
diff --git a/gio-sharp/generator/Parameters.cs b/lib/gio-sharp/generator/Parameters.cs
similarity index 100%
rename from gio-sharp/generator/Parameters.cs
rename to lib/gio-sharp/generator/Parameters.cs
diff --git a/gio-sharp/generator/Parser.cs b/lib/gio-sharp/generator/Parser.cs
similarity index 100%
rename from gio-sharp/generator/Parser.cs
rename to lib/gio-sharp/generator/Parser.cs
diff --git a/gio-sharp/generator/Property.cs b/lib/gio-sharp/generator/Property.cs
similarity index 100%
rename from gio-sharp/generator/Property.cs
rename to lib/gio-sharp/generator/Property.cs
diff --git a/gio-sharp/generator/PropertyBase.cs b/lib/gio-sharp/generator/PropertyBase.cs
similarity index 100%
rename from gio-sharp/generator/PropertyBase.cs
rename to lib/gio-sharp/generator/PropertyBase.cs
diff --git a/gio-sharp/generator/ReturnValue.cs b/lib/gio-sharp/generator/ReturnValue.cs
similarity index 100%
rename from gio-sharp/generator/ReturnValue.cs
rename to lib/gio-sharp/generator/ReturnValue.cs
diff --git a/gio-sharp/generator/Signal.cs b/lib/gio-sharp/generator/Signal.cs
similarity index 100%
rename from gio-sharp/generator/Signal.cs
rename to lib/gio-sharp/generator/Signal.cs
diff --git a/gio-sharp/generator/Signature.cs b/lib/gio-sharp/generator/Signature.cs
similarity index 100%
rename from gio-sharp/generator/Signature.cs
rename to lib/gio-sharp/generator/Signature.cs
diff --git a/gio-sharp/generator/SimpleBase.cs b/lib/gio-sharp/generator/SimpleBase.cs
similarity index 100%
rename from gio-sharp/generator/SimpleBase.cs
rename to lib/gio-sharp/generator/SimpleBase.cs
diff --git a/gio-sharp/generator/SimpleGen.cs b/lib/gio-sharp/generator/SimpleGen.cs
similarity index 100%
rename from gio-sharp/generator/SimpleGen.cs
rename to lib/gio-sharp/generator/SimpleGen.cs
diff --git a/gio-sharp/generator/Statistics.cs b/lib/gio-sharp/generator/Statistics.cs
similarity index 100%
rename from gio-sharp/generator/Statistics.cs
rename to lib/gio-sharp/generator/Statistics.cs
diff --git a/gio-sharp/generator/StructBase.cs b/lib/gio-sharp/generator/StructBase.cs
similarity index 100%
rename from gio-sharp/generator/StructBase.cs
rename to lib/gio-sharp/generator/StructBase.cs
diff --git a/gio-sharp/generator/StructField.cs b/lib/gio-sharp/generator/StructField.cs
similarity index 100%
rename from gio-sharp/generator/StructField.cs
rename to lib/gio-sharp/generator/StructField.cs
diff --git a/gio-sharp/generator/StructGen.cs b/lib/gio-sharp/generator/StructGen.cs
similarity index 100%
rename from gio-sharp/generator/StructGen.cs
rename to lib/gio-sharp/generator/StructGen.cs
diff --git a/gio-sharp/generator/SymbolTable.cs b/lib/gio-sharp/generator/SymbolTable.cs
similarity index 100%
rename from gio-sharp/generator/SymbolTable.cs
rename to lib/gio-sharp/generator/SymbolTable.cs
diff --git a/gio-sharp/generator/VMSignature.cs b/lib/gio-sharp/generator/VMSignature.cs
similarity index 100%
rename from gio-sharp/generator/VMSignature.cs
rename to lib/gio-sharp/generator/VMSignature.cs
diff --git a/gio-sharp/generator/VirtualMethod.cs b/lib/gio-sharp/generator/VirtualMethod.cs
similarity index 100%
rename from gio-sharp/generator/VirtualMethod.cs
rename to lib/gio-sharp/generator/VirtualMethod.cs
diff --git a/gio-sharp/gio/AppInfoAdapter.custom b/lib/gio-sharp/gio/AppInfoAdapter.custom
similarity index 100%
rename from gio-sharp/gio/AppInfoAdapter.custom
rename to lib/gio-sharp/gio/AppInfoAdapter.custom
diff --git a/gio-sharp/gio/AssemblyInfo.cs b/lib/gio-sharp/gio/AssemblyInfo.cs
similarity index 100%
rename from gio-sharp/gio/AssemblyInfo.cs
rename to lib/gio-sharp/gio/AssemblyInfo.cs
diff --git a/gio-sharp/gio/File.custom b/lib/gio-sharp/gio/File.custom
similarity index 100%
rename from gio-sharp/gio/File.custom
rename to lib/gio-sharp/gio/File.custom
diff --git a/gio-sharp/gio/FileAdapter.custom b/lib/gio-sharp/gio/FileAdapter.custom
similarity index 100%
rename from gio-sharp/gio/FileAdapter.custom
rename to lib/gio-sharp/gio/FileAdapter.custom
diff --git a/gio-sharp/gio/FileEnumerator.custom b/lib/gio-sharp/gio/FileEnumerator.custom
similarity index 100%
rename from gio-sharp/gio/FileEnumerator.custom
rename to lib/gio-sharp/gio/FileEnumerator.custom
diff --git a/gio-sharp/gio/FileFactory.cs b/lib/gio-sharp/gio/FileFactory.cs
similarity index 100%
rename from gio-sharp/gio/FileFactory.cs
rename to lib/gio-sharp/gio/FileFactory.cs
diff --git a/gio-sharp/gio/Gio.metadata b/lib/gio-sharp/gio/Gio.metadata
similarity index 100%
rename from gio-sharp/gio/Gio.metadata
rename to lib/gio-sharp/gio/Gio.metadata
diff --git a/gio-sharp/gio/GioStream.cs b/lib/gio-sharp/gio/GioStream.cs
similarity index 100%
rename from gio-sharp/gio/GioStream.cs
rename to lib/gio-sharp/gio/GioStream.cs
diff --git a/gio-sharp/gio/Makefile.am b/lib/gio-sharp/gio/Makefile.am
similarity index 84%
rename from gio-sharp/gio/Makefile.am
rename to lib/gio-sharp/gio/Makefile.am
index 7a51e0b..d4bfccf 100644
--- a/gio-sharp/gio/Makefile.am
+++ b/lib/gio-sharp/gio/Makefile.am
@@ -1,4 +1,4 @@
-include ../../Makefile.include
+include $(top_srcdir)/Makefile.include
 
 UNSAFE = -unsafe
 DEBUG = -debug
@@ -28,11 +28,11 @@ gio-api.xml: $(srcdir)/gio-api.raw $(srcdir)/Gio.metadata
 	gapi2-fixup --api=gio-api.xml --metadata=$(srcdir)/Gio.metadata
 
 $(top_builddir)/gio-sharp/generator/gapi_codegen.exe:
-	$(MAKE) -C $(top_builddir)/gio-sharp/generator
+	$(MAKE) -C $(top_builddir)/lib/gio-sharp/generator
 
 generated/File.cs: gio-api.xml $(CUSTOMS) $(top_builddir)/gio-sharp/generator/gapi_codegen.exe
 	@echo -e "\n*** Generating C# code"
-	$(MONO) $(top_builddir)/gio-sharp/generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate gio-api.xml
+	$(MONO) $(top_builddir)/lib/gio-sharp/generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate gio-api.xml
 
 gtk-sharp.snk: $(SNK)
 	cp $< $@
diff --git a/gio-sharp/gio/gio-api.raw b/lib/gio-sharp/gio/gio-api.raw
similarity index 100%
rename from gio-sharp/gio/gio-api.raw
rename to lib/gio-sharp/gio/gio-api.raw
diff --git a/gio-sharp/gio/gio-sharp.dll.config b/lib/gio-sharp/gio/gio-sharp.dll.config
similarity index 100%
rename from gio-sharp/gio/gio-sharp.dll.config
rename to lib/gio-sharp/gio/gio-sharp.dll.config
diff --git a/gio-sharp/gio/snk b/lib/gio-sharp/gio/snk
similarity index 100%
rename from gio-sharp/gio/snk
rename to lib/gio-sharp/gio/snk
diff --git a/src/f-spot.in b/src/f-spot.in
index 4382653..8fa79c5 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@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/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:../lib/gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/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:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 604e8b1..7eee6ea 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -46,7 +46,7 @@ FSpot.Tests.dll: $(SOURCES)
 	gmcs $(MCSFLAGS) $(PKGS) $(REFS) $(SOURCES) $(RESOURCES) -out:FSpot.Tests.dll
 
 test: FSpot.Tests.dll
-	export MONO_PATH=$(top_srcdir)/src:$(top_srcdir)/gio-sharp/gio/:$(top_srcdir)/lib/semweb:$(top_srcdir)/lib/gtk-sharp-beans; nunit-console -noshadow -nologo $(TEST_ASSEMBLIES) 
+	export MONO_PATH=$(top_srcdir)/src:$(top_srcdir)/lib/gio-sharp/gio/:$(top_srcdir)/lib/semweb:$(top_srcdir)/lib/gtk-sharp-beans; nunit-console -noshadow -nologo $(TEST_ASSEMBLIES) 
 
 CLEANFILES =			\
 	FSpot.Tests.dll.mdb	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]