[pdfmod] Fix make distcheck

[Gabriel Burt <gburt src gnome org>]

commit f0bba88801c20eb050c6bd6c571bb757304c618d
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Mon Aug 17 10:55:36 2009 -0700

    Fix make distcheck

 Makefile.am                   |    1 +
 lib/poppler-sharp/Makefile.am |   70 ++++++++++++++++++++++++++++++++++++----
 src/Makefile.am               |   24 +++-----------
 3 files changed, 69 insertions(+), 26 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index afddbbd..95833ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ uninstall-hook:
 	done;
 
 EXTRA_DIST = \
+	lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \
 	gnome-doc-utils.make \
 	icon-theme-installer \
 	intltool-extract.in \
diff --git a/lib/poppler-sharp/Makefile.am b/lib/poppler-sharp/Makefile.am
index 8ec8487..5ec3194 100644
--- a/lib/poppler-sharp/Makefile.am
+++ b/lib/poppler-sharp/Makefile.am
@@ -1,25 +1,25 @@
 
-EXTRA_DIST =
+EXTRA_DIST = 
 
 if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = $(MCS)
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -unsafe -debug "-define:DEBUG"
-ASSEMBLY = ../bin/poppler-sharp.dll
+ASSEMBLY = ../../bin/poppler-sharp.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  
-BUILD_DIR = ../bin
+BUILD_DIR = ../../bin
 
 endif
 
 if ENABLE_RELEASE
 ASSEMBLY_COMPILER_COMMAND = $(MCS)
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -unsafe -debug -define:DEBUG
-ASSEMBLY = ../bin/poppler-sharp.dll
+ASSEMBLY = ../../bin/poppler-sharp.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
 PROJECT_REFERENCES =  
-BUILD_DIR = ../bin
+BUILD_DIR = ../../bin
 
 endif
 
@@ -34,8 +34,64 @@ RESGEN=resgen2
 all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES) 
 
 FILES =  \
-	poppler-sharp/generated/*.cs \
-	poppler-sharp/Document.cs
+	poppler-sharp/Document.cs \
+	poppler-sharp/generated/Action.cs \
+	poppler-sharp/generated/ActionAny.cs \
+	poppler-sharp/generated/ActionGotoDest.cs \
+	poppler-sharp/generated/ActionGotoRemote.cs \
+	poppler-sharp/generated/ActionLaunch.cs \
+	poppler-sharp/generated/ActionMovie.cs \
+	poppler-sharp/generated/ActionNamed.cs \
+	poppler-sharp/generated/ActionType.cs \
+	poppler-sharp/generated/ActionUri.cs \
+	poppler-sharp/generated/Annot.cs \
+	poppler-sharp/generated/AnnotCalloutLine.cs \
+	poppler-sharp/generated/AnnotExternalDataType.cs \
+	poppler-sharp/generated/AnnotFlag.cs \
+	poppler-sharp/generated/AnnotFreeText.cs \
+	poppler-sharp/generated/AnnotFreeTextQuadding.cs \
+	poppler-sharp/generated/AnnotMapping.cs \
+	poppler-sharp/generated/AnnotMarkup.cs \
+	poppler-sharp/generated/AnnotMarkupReplyType.cs \
+	poppler-sharp/generated/AnnotText.cs \
+	poppler-sharp/generated/AnnotTextState.cs \
+	poppler-sharp/generated/AnnotType.cs \
+	poppler-sharp/generated/Attachment.cs \
+	poppler-sharp/generated/AttachmentSaveFunc.cs \
+	poppler-sharp/generated/Backend.cs \
+	poppler-sharp/generated/Color.cs \
+	poppler-sharp/generated/Dest.cs \
+	poppler-sharp/generated/DestType.cs \
+	poppler-sharp/generated/Document.cs \
+	poppler-sharp/generated/Error.cs \
+	poppler-sharp/generated/FontInfo.cs \
+	poppler-sharp/generated/FontType.cs \
+	poppler-sharp/generated/FontsIter.cs \
+	poppler-sharp/generated/FormButtonType.cs \
+	poppler-sharp/generated/FormChoiceType.cs \
+	poppler-sharp/generated/FormField.cs \
+	poppler-sharp/generated/FormFieldMapping.cs \
+	poppler-sharp/generated/FormFieldType.cs \
+	poppler-sharp/generated/FormTextType.cs \
+	poppler-sharp/generated/Global.cs \
+	poppler-sharp/generated/ImageMapping.cs \
+	poppler-sharp/generated/IndexIter.cs \
+	poppler-sharp/generated/Layer.cs \
+	poppler-sharp/generated/LayersIter.cs \
+	poppler-sharp/generated/LinkMapping.cs \
+	poppler-sharp/generated/Orientation.cs \
+	poppler-sharp/generated/PSFile.cs \
+	poppler-sharp/generated/Page.cs \
+	poppler-sharp/generated/PageLayout.cs \
+	poppler-sharp/generated/PageMode.cs \
+	poppler-sharp/generated/PageTransition.cs \
+	poppler-sharp/generated/PageTransitionAlignment.cs \
+	poppler-sharp/generated/PageTransitionDirection.cs \
+	poppler-sharp/generated/PageTransitionType.cs \
+	poppler-sharp/generated/PopplerSharp.AttachmentSaveFuncNative.cs \
+	poppler-sharp/generated/Rectangle.cs \
+	poppler-sharp/generated/SelectionStyle.cs \
+	poppler-sharp/generated/ViewerPreferences.cs
 
 DATA_FILES = 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 141ab8e..73fe715 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,10 +13,6 @@ PROJECT_REFERENCES = \
 	../bin/PdfSharp.dll
 BUILD_DIR = ../bin
 
-PDFSHARP_DLL_SOURCE=../bin/PdfSharp.dll
-PDFSHARP_DLL_MDB_SOURCE=../bin/PdfSharp.dll.mdb
-POPPLER_SHARP_DLL_SOURCE=../lib/poppler-sharp/poppler-sharp/poppler-sharp.dll
-POPPLER_SHARP_DLL_CONFIG_SOURCE=../lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config
 PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
 
 endif
@@ -31,10 +27,6 @@ PROJECT_REFERENCES =  \
 	../bin/PdfSharp.dll
 BUILD_DIR = ../bin
 
-PDFSHARP_DLL_SOURCE=../bin/PdfSharp.dll
-PDFSHARP_DLL_MDB_SOURCE=../bin/PdfSharp.dll.mdb
-POPPLER_SHARP_DLL_SOURCE=../lib/poppler-sharp/poppler-sharp/poppler-sharp.dll
-POPPLER_SHARP_DLL_CONFIG_SOURCE=../lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config
 PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
 
 endif
@@ -43,10 +35,6 @@ AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
 PROGRAMFILES = \
-	$(PDFSHARP_DLL) \
-	$(PDFSHARP_DLL_MDB) \
-	$(POPPLER_SHARP_DLL) \
-	$(POPPLER_SHARP_DLL_CONFIG) \
 	$(PDFMOD_EXE_MDB)  
 
 BINARIES = \
@@ -95,13 +83,14 @@ REFERENCES =  \
 	-pkg:glib-sharp-2.0 \
 	-pkg:gnome-sharp-2.0 \
 	-pkg:gtk-sharp-2.0 \
+	-r:$(PDFSHARP_DLL) \
+	-r:$(POPPLER_SHARP_DLL) \
+	-r:$(BUILD_DIR)/Hyena.dll \
+	-r:$(BUILD_DIR)/Hyena.Gui.dll \
 	System \
 	System.Core
 
-DLL_REFERENCES =  \
-	$(BUILD_DIR)/poppler-sharp.dll \
-	$(BUILD_DIR)/Hyena.dll \
-	$(BUILD_DIR)/Hyena.Gui.dll
+DLL_REFERENCES = 
 
 CLEANFILES = $(PROGRAMFILES) $(BINARIES)
 
@@ -110,12 +99,9 @@ include $(top_srcdir)/Makefile.include
 PDFSHARP_DLL = $(BUILD_DIR)/PdfSharp.dll
 PDFSHARP_DLL_MDB = $(BUILD_DIR)/PdfSharp.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,POPPLER_SHARP_DLL))
-$(eval $(call emit-deploy-target,POPPLER_SHARP_DLL_CONFIG))
 $(eval $(call emit-deploy-wrapper,PDFMOD,pdfmod,x))