[pdfmod] Various small makefile and MonoDevelop fixes
- From: Bertrand Lorentz <blorentz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pdfmod] Various small makefile and MonoDevelop fixes
- Date: Thu, 20 Aug 2009 19:44:46 +0000 (UTC)
commit 67ec4ebd32564cb9a7849c75c62f7dcfca012734
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Thu Aug 20 21:33:35 2009 +0200
Various small makefile and MonoDevelop fixes
Those two should now stop stepping on each other's toes.
Makefile.am | 4 +++-
src/Makefile.am | 14 +++++++-------
src/PdfMod.mdp | 10 +++-------
3 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7a05630..f35b315 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,9 @@ uninstall-hook:
rm -f $(DESTDIR)$(INSTALL_DIR_RESOLVED)/`basename $$ASM`; \
done;
+clean-local:
+ rm -rf $(top_builddir)/bin
+
EXTRA_DIST = \
lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \
gnome-doc-utils.make \
@@ -40,7 +43,6 @@ EXTRA_DIST = \
HACKING
CLEANFILES = \
- bin/* \
intltool-extract \
intltool-update \
intltool-merge
diff --git a/src/Makefile.am b/src/Makefile.am
index c77c44b..28e7238 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,9 @@ 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 \
+ ../bin/poppler-sharp.dll
BUILD_DIR = ../bin
PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
@@ -24,7 +25,8 @@ ASSEMBLY = ../bin/PdfMod.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
- ../bin/PdfSharp.dll
+ ../bin/PdfSharp.dll \
+ ../bin/poppler-sharp.dll
BUILD_DIR = ../bin
PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
@@ -84,10 +86,8 @@ 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 \
+ -pkg:hyena \
+ -pkg:hyena.gui \
System \
System.Core
diff --git a/src/PdfMod.mdp b/src/PdfMod.mdp
index 0619ef0..d784070 100644
--- a/src/PdfMod.mdp
+++ b/src/PdfMod.mdp
@@ -48,19 +48,15 @@
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="True" refto="PdfSharp" />
- <ProjectReference type="Assembly" localcopy="True" specificVersion="False" refto="../lib/Hyena.dll" />
- <ProjectReference type="Assembly" localcopy="True" specificVersion="False" refto="../lib/Mono.Data.Sqlite.dll" />
- <ProjectReference type="Assembly" localcopy="True" specificVersion="False" refto="../lib/Hyena.Gui.dll" />
- <ProjectReference type="Assembly" localcopy="True" specificVersion="False" refto="../lib/poppler-sharp.dll" />
<ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="Hyena, Version=0.0.0.0, Culture=neutral" />
+ <ProjectReference type="Gac" localcopy="True" refto="Hyena.Gui, Version=0.0.0.0, Culture=neutral" />
+ <ProjectReference type="Project" localcopy="True" refto="poppler-sharp" />
</References>
<GtkDesignInfo gettextClass="Mono.Posix.Catalog" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="..">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]