[pdfmod] Fix PDFMod's compilation to choose correct Poppler#



commit da6b1cfe37c41741d00792e17ee21163e4fb0533
Author: Chow Loong Jin <hyperair ubuntu com>
Date:   Fri Jun 18 03:23:18 2010 +0800

    Fix PDFMod's compilation to choose correct Poppler#
    
    Signed-off-by: Gabriel Burt <gabriel burt gmail com>

 src/Makefile.am |   28 +++++++---------------------
 1 files changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 52a31d6..892373f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,36 +3,16 @@
 #
 EXTRA_DIST =
 
-if ENABLE_DEBUG
 ASSEMBLY_COMPILER_COMMAND = $(MCS)
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
 ASSEMBLY = ../bin/PdfMod.exe
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = exe
-PROJECT_REFERENCES =  \
-	../bin/PdfSharp.dll \
-	../bin/poppler-sharp.dll
+PROJECT_REFERENCES = ../bin/PdfSharp.dll
 BUILD_DIR = ../bin
 
 PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
 
-endif
-
-if ENABLE_RELEASE
-ASSEMBLY_COMPILER_COMMAND = $(MCS)
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
-ASSEMBLY = ../bin/PdfMod.exe
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
-COMPILE_TARGET = exe
-PROJECT_REFERENCES =  \
-	../bin/PdfSharp.dll \
-	../bin/poppler-sharp.dll
-BUILD_DIR = ../bin
-
-PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
-
-endif
-
 AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
@@ -90,6 +70,12 @@ REFERENCES =  \
 	System \
 	System.Core
 
+if USE_BUNDLED_POPPLER
+PROJECT_REFERENCES += ../bin/poppler-sharp.dll
+else
+REFERENCES += -pkg:poppler-sharp
+endif
+
 DLL_REFERENCES = 
 
 CLEANFILES = $(PROGRAMFILES) $(BINARIES)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]