[banshee/hyena-submodule] [build] Add Hyena as a submodule
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/hyena-submodule] [build] Add Hyena as a submodule
- Date: Wed, 26 May 2010 02:49:19 +0000 (UTC)
commit 7a4059610c194c929180892ec8c87bf14589eb1a
Author: Gabriel Burt <gabriel burt gmail com>
Date: Tue May 25 15:38:02 2010 -0700
[build] Add Hyena as a submodule
Hyena is now a separate project, used by PDF Mod and soon F-Spot. Using
git submodule, we integrate it back into the Banshee build system so
Banshee developers can still hack on it easily, but this makes it easier
for other apps to use too. See http://live.gnome.org/Hyena for more
info.
.gitmodules | 3 +++
Makefile.am | 1 +
build/build.environment.mk | 2 +-
configure.ac | 14 +++++++++++---
hyena | 1 +
src/Libraries/Makefile.am | 3 ---
6 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cbb1e57
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "hyena"]
+ path = hyena
+ url = git://git.gnome.org/hyena
diff --git a/Makefile.am b/Makefile.am
index ccb2f8a..2199ea0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
data \
libbanshee \
gstreamer \
+ hyena \
src \
docs \
tests \
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 44b8d10..15b98e7 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -37,7 +37,7 @@ LINK_SQLITE = -r:System.Data -r:$(DIR_BIN)/Mono.Data.Sqlite.dll
# Hyena
REF_HYENA = $(LINK_SYSTEM) $(LINK_SQLITE) $(LINK_MONO_POSIX)
-LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll
+LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll -r:$(DIR_BIN)/Hyena.Data.Sqlite.dll
LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
# Hyena.Gui
diff --git a/configure.ac b/configure.ac
index 2d16af9..15126f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,17 @@ libbanshee/Makefile
gstreamer/Makefile
gstreamer/equalizer/Makefile
+hyena/Makefile
+hyena/build/Makefile
+hyena/build/m4/Makefile
+hyena/src/Mono.Data.Sqlite/Makefile
+hyena/src/Hyena/hyena.pc
+hyena/src/Hyena/Makefile
+hyena/src/Hyena.Data.Sqlite/hyena.data.sqlite.pc
+hyena/src/Hyena.Data.Sqlite/Makefile
+hyena/src/Hyena.Gui/hyena.gui.pc
+hyena/src/Hyena.Gui/Makefile
+
src/Makefile
src/AssemblyInfo.cs
@@ -290,12 +301,9 @@ src/Backends/Banshee.NowPlaying.X11/Makefile
src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile
src/Libraries/Makefile
-src/Libraries/Hyena/Makefile
-src/Libraries/Hyena.Gui/Makefile
src/Libraries/Lastfm/Makefile
src/Libraries/Lastfm.Gui/Makefile
src/Libraries/Migo/Makefile
-src/Libraries/Mono.Data.Sqlite/Makefile
src/Libraries/Mono.Media/Makefile
src/Libraries/Mtp/Makefile
src/Libraries/Mtp/Mtp.dll.config
diff --git a/hyena b/hyena
new file mode 160000
index 0000000..0ab0cca
--- /dev/null
+++ b/hyena
@@ -0,0 +1 @@
+Subproject commit 0ab0ccace967c43c320f1a921c6a51078d31a7c5
diff --git a/src/Libraries/Makefile.am b/src/Libraries/Makefile.am
index 7d68086..f5ab57d 100644
--- a/src/Libraries/Makefile.am
+++ b/src/Libraries/Makefile.am
@@ -1,7 +1,4 @@
SUBDIRS = \
- Mono.Data.Sqlite \
- Hyena \
- Hyena.Gui \
Migo \
Mono.Media \
Mtp \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]