[pdfmod] Remove bundled Hyena

[Gabriel Burt <gburt src gnome org>]

commit ec1a7ba77733b5f6d81f650a096cd080f5acf255
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Sat Aug 15 12:35:00 2009 -0700

    Remove bundled Hyena

 Makefile.am                  |    9 +------
 README                       |    1 +
 configure.ac                 |   16 ++++++++++++++
 lib/Hyena.Gui.dll            |  Bin 182784 -> 0 bytes
 lib/Hyena.Gui.dll.config     |   17 ---------------
 lib/Hyena.Gui.dll.mdb        |  Bin 82757 -> 0 bytes
 lib/Hyena.dll                |  Bin 191488 -> 0 bytes
 lib/Hyena.dll.mdb            |  Bin 98744 -> 0 bytes
 lib/Mono.Data.Sqlite.dll     |  Bin 101376 -> 0 bytes
 lib/Mono.Data.Sqlite.dll.mdb |  Bin 32026 -> 0 bytes
 src/Makefile.am              |   45 +++++------------------------------------
 11 files changed, 25 insertions(+), 63 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a3694f8..39fe91f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,13 +14,8 @@ run:
 EXTRA_DIST = \
 	gnome-doc-utils.make \
 	icon-theme-installer \
-	lib/Hyena.dll \
-	lib/Hyena.dll.mdb \
-	lib/Hyena.Gui.dll \
-	lib/Hyena.Gui.dll.mdb \
-	lib/Hyena.Gui.dll.config \
-	lib/Mono.Data.Sqlite.dll \
-	lib/Mono.Data.Sqlite.dll.mdb \
+	$(BUNDLE_ASSEMBLIES) \
+	$(BUNDLE_FILES) \
 	lib/poppler-sharp.dll \
 	lib/poppler-sharp.dll.config \
 	intltool-extract.in \
diff --git a/README b/README
index b34f16b..f40ae40 100644
--- a/README
+++ b/README
@@ -8,6 +8,7 @@ Dependencies:
  * poppler
  * gnome-doc-utils-devel
  * gnome-common (if building from git)
+ * Hyena (http://gitorious.org/hyena)
 
 To build from git:
 
diff --git a/configure.ac b/configure.ac
index 3ebaaa7..c5bb1c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,22 @@ PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
 PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
 
 dnl package checks, per config
+PKG_CHECK_MODULES(HYENA, hyena = 0.1)
+HYENA_ASSEMBLIES="`$PKG_CONFIG --variable=Assemblies hyena`"
+HYENA_FILES="`$PKG_CONFIG --variable=Files hyena`"
+AC_SUBST(HYENA_ASSEMBLIES)
+AC_SUBST(HYENA_FILES)
+
+PKG_CHECK_MODULES(HYENA_GUI, hyena.gui = 0.1)
+HYENA_GUI_ASSEMBLIES="`$PKG_CONFIG --variable=Assemblies hyena.gui`"
+HYENA_GUI_FILES="`$PKG_CONFIG --variable=Files hyena.gui`"
+AC_SUBST(HYENA_GUI_ASSEMBLIES)
+AC_SUBST(HYENA_GUI_FILES)
+
+BUNDLE_ASSEMBLIES="$HYENA_ASSEMBLIES $HYENA_GUI_ASSEMBLIES"
+BUNDLE_FILES="$HYENA_FILES $HYENA_GUI_FILES"
+AC_SUBST(BUNDLE_ASSEMBLIES)
+AC_SUBST(BUNDLE_FILES)
 
 dnl How to configure for distcheck
 DISTCHECK_CONFIGURE_FLAGS=""
diff --git a/src/Makefile.am b/src/Makefile.am
index 20aee01..98e6595 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,18 +9,12 @@ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-
 ASSEMBLY = ../bin/PdfMod.exe
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = exe
-PROJECT_REFERENCES = ../bin/PdfSharp.dll
+PROJECT_REFERENCES = \
+	../bin/PdfSharp.dll
 BUILD_DIR = ../bin
 
 PDFSHARP_DLL_SOURCE=../bin/PdfSharp.dll
 PDFSHARP_DLL_MDB_SOURCE=../bin/PdfSharp.dll.mdb
-HYENA_DLL_SOURCE=../lib/Hyena.dll
-HYENA_DLL_MDB_SOURCE=../lib/Hyena.dll.mdb
-MONO_DATA_SQLITE_DLL_SOURCE=../lib/Mono.Data.Sqlite.dll
-MONO_DATA_SQLITE_DLL_MDB_SOURCE=../lib/Mono.Data.Sqlite.dll.mdb
-HYENA_GUI_DLL_SOURCE=../lib/Hyena.Gui.dll
-HYENA_GUI_DLL_CONFIG_SOURCE=../lib/Hyena.Gui.dll.config
-HYENA_GUI_DLL_MDB_SOURCE=../lib/Hyena.Gui.dll.mdb
 POPPLER_SHARP_DLL_SOURCE=../lib/poppler-sharp.dll
 POPPLER_SHARP_DLL_CONFIG_SOURCE=../lib/poppler-sharp.dll.config
 PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
@@ -39,13 +33,6 @@ BUILD_DIR = ../bin
 
 PDFSHARP_DLL_SOURCE=../bin/PdfSharp.dll
 PDFSHARP_DLL_MDB_SOURCE=../bin/PdfSharp.dll.mdb
-HYENA_DLL_SOURCE=../lib/Hyena.dll
-HYENA_DLL_MDB_SOURCE=../lib/Hyena.dll.mdb
-MONO_DATA_SQLITE_DLL_SOURCE=../lib/Mono.Data.Sqlite.dll
-MONO_DATA_SQLITE_DLL_MDB_SOURCE=../lib/Mono.Data.Sqlite.dll.mdb
-HYENA_GUI_DLL_SOURCE=../lib/Hyena.Gui.dll
-HYENA_GUI_DLL_CONFIG_SOURCE=../lib/Hyena.Gui.dll.config
-HYENA_GUI_DLL_MDB_SOURCE=../lib/Hyena.Gui.dll.mdb
 POPPLER_SHARP_DLL_SOURCE=../lib/poppler-sharp.dll
 POPPLER_SHARP_DLL_CONFIG_SOURCE=../lib/poppler-sharp.dll.config
 PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
@@ -58,13 +45,6 @@ SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 PROGRAMFILES = \
 	$(PDFSHARP_DLL) \
 	$(PDFSHARP_DLL_MDB) \
-	$(HYENA_DLL) \
-	$(HYENA_DLL_MDB) \
-	$(MONO_DATA_SQLITE_DLL) \
-	$(MONO_DATA_SQLITE_DLL_MDB) \
-	$(HYENA_GUI_DLL) \
-	$(HYENA_GUI_DLL_CONFIG) \
-	$(HYENA_GUI_DLL_MDB) \
 	$(POPPLER_SHARP_DLL) \
 	$(POPPLER_SHARP_DLL_CONFIG) \
 	$(PDFMOD_EXE_MDB)  
@@ -116,12 +96,11 @@ REFERENCES =  \
 	-pkg:gnome-sharp-2.0 \
 	-pkg:gtk-sharp-2.0 \
 	System \
+	$(HYENA_LIBS) \
+	$(HYENA_GUI_LIBS) \
 	System.Core
 
 DLL_REFERENCES =  \
-	../lib/Hyena.dll \
-	../lib/Hyena.Gui.dll \
-	../lib/Mono.Data.Sqlite.dll \
 	../lib/poppler-sharp.dll
 
 CLEANFILES = $(PROGRAMFILES) $(BINARIES)
@@ -130,25 +109,11 @@ include $(top_srcdir)/Makefile.include
 
 PDFSHARP_DLL = $(BUILD_DIR)/PdfSharp.dll
 PDFSHARP_DLL_MDB = $(BUILD_DIR)/PdfSharp.dll.mdb
-HYENA_DLL = $(BUILD_DIR)/Hyena.dll
-HYENA_DLL_MDB = $(BUILD_DIR)/Hyena.dll.mdb
-MONO_DATA_SQLITE_DLL = $(BUILD_DIR)/Mono.Data.Sqlite.dll
-MONO_DATA_SQLITE_DLL_MDB = $(BUILD_DIR)/Mono.Data.Sqlite.dll.mdb
-HYENA_GUI_DLL = $(BUILD_DIR)/Hyena.Gui.dll
-HYENA_GUI_DLL_CONFIG = $(BUILD_DIR)/Hyena.Gui.dll.config
-HYENA_GUI_DLL_MDB = $(BUILD_DIR)/Hyena.Gui.dll.mdb
 POPPLER_SHARP_DLL = $(BUILD_DIR)/poppler-sharp.dll
 POPPLER_SHARP_DLL_CONFIG = $(BUILD_DIR)/poppler-sharp.dll.config
 PDFMOD_EXE_MDB = $(BUILD_DIR)/PdfMod.exe.mdb
 PDFMOD = $(BUILD_DIR)/pdfmod
 
-$(eval $(call emit-deploy-target,HYENA_DLL))
-$(eval $(call emit-deploy-target,HYENA_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_DATA_SQLITE_DLL))
-$(eval $(call emit-deploy-target,MONO_DATA_SQLITE_DLL_MDB))
-$(eval $(call emit-deploy-target,HYENA_GUI_DLL))
-$(eval $(call emit-deploy-target,HYENA_GUI_DLL_CONFIG))
-$(eval $(call emit-deploy-target,HYENA_GUI_DLL_MDB))
 $(eval $(call emit-deploy-target,POPPLER_SHARP_DLL))
 $(eval $(call emit-deploy-target,POPPLER_SHARP_DLL_CONFIG))
 $(eval $(call emit-deploy-wrapper,PDFMOD,pdfmod,x))
@@ -163,3 +128,5 @@ $(ASSEMBLY_MDB): $(ASSEMBLY)
 $(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
 	mkdir -p $(shell dirname $(ASSEMBLY))
 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
+	cp $(BUNDLE_ASSEMBLIES) $(BUILD_DIR)
+	cp $(BUNDLE_FILES) $(BUILD_DIR)