diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2012-06-27 15:12:59 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2012-06-27 15:12:59 +0400 |
| commit | 38f5875620ba168e63123bd8d1ef976da482d460 (patch) | |
| tree | 90e18f940dc6986cf1cd54e232da15a1b0074b1e /main/src/addins/GnomePlatform | |
| parent | c0d9cf9009c6c55689bc407164ba4cc11b389697 (diff) | |
| parent | 006ca16da0746d6454f10ff55ae17d2dd94713b0 (diff) | |
Merge remote-tracking branch 'origin/master' into ui-refresh
Conflicts:
main/src/addins/MacPlatform/Makefile.am
main/src/core/MonoDevelop.Ide/Makefile.am
Diffstat (limited to 'main/src/addins/GnomePlatform')
| -rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.csproj | 9 | ||||
| -rw-r--r-- | main/src/addins/GnomePlatform/Makefile.am | 52 |
2 files changed, 12 insertions, 49 deletions
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.csproj b/main/src/addins/GnomePlatform/GnomePlatform.csproj index 9051c4b28e..cacea21aac 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.csproj +++ b/main/src/addins/GnomePlatform/GnomePlatform.csproj @@ -44,6 +44,15 @@ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> </Reference> + <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="gnome-vfs-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> + <SpecificVersion>False</SpecificVersion> + </Reference> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> diff --git a/main/src/addins/GnomePlatform/Makefile.am b/main/src/addins/GnomePlatform/Makefile.am index 07c24c2ce0..55fe085e70 100644 --- a/main/src/addins/GnomePlatform/Makefile.am +++ b/main/src/addins/GnomePlatform/Makefile.am @@ -1,51 +1,5 @@ +include $(top_srcdir)/xbuild.include -ADDIN_BUILD = $(top_builddir)/build/AddIns -ASSEMBLY = $(ADDIN_BUILD)/GnomePlatform.dll - -DEPS = \ - $(top_builddir)/build/bin/MonoDevelop.Core.dll \ - $(top_builddir)/build/bin/MonoDevelop.Ide.dll - -REFS = \ - $(GCONF_SHARP_LIBS) \ - $(GLIB_SHARP_LIBS) \ - $(GNOME_SHARP_LIBS) \ - $(GNOME_VFS_SHARP_LIBS) \ - $(GTK_SHARP_LIBS) \ - -r:System - -FILES = \ - AssemblyInfo.cs \ - Gio.cs \ - GnomePlatform.cs - -RES = GnomePlatform.addin.xml - -if ENABLE_GNOMEPLATFORM -all: $(ASSEMBLY) $(ASSEMBLY).mdb -else -all: +if ! ENABLE_GNOMEPLATFORM +SKIP=y endif - -dll_config = GnomePlatform.dll.config -build_dll_config = $(ADDIN_BUILD)/$(dll_config) - -$(build_dll_config): $(srcdir)/$(dll_config) - mkdir -p $(ADDIN_BUILD) - cp $(srcdir)/$(dll_config) $@ - -$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS) - mkdir -p $(ADDIN_BUILD) - $(CSC) $(CSC_FLAGS) $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -target:library - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -if ENABLE_GNOMEPLATFORM -assemblydir = $(MD_ADDIN_DIR)/GnomePlatform -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_dll_config) -endif - -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_dll_config) -EXTRA_DIST = $(FILES) $(RES) $(dll_config) - -include $(top_srcdir)/Makefile.include |