diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2012-06-26 19:01:03 +0400 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2012-06-26 19:01:17 +0400 |
| commit | 5a53e6c4030819ebb6cea1d575c42fb8675adcb2 (patch) | |
| tree | c9992133f025553abcbcac38ad5ff73db392ee0d /main/src/addins/GnomePlatform | |
| parent | 3824e16bb8e31f0351ccd0bfe3de0f986c1eb38f (diff) | |
Revert "[Build] Change the build system to use xbuild instead of makefiles"""
Back it out for now. There are some reported build issues.
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, 49 insertions, 12 deletions
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.csproj b/main/src/addins/GnomePlatform/GnomePlatform.csproj index cacea21aac..9051c4b28e 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.csproj +++ b/main/src/addins/GnomePlatform/GnomePlatform.csproj @@ -44,15 +44,6 @@ <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 55fe085e70..07c24c2ce0 100644 --- a/main/src/addins/GnomePlatform/Makefile.am +++ b/main/src/addins/GnomePlatform/Makefile.am @@ -1,5 +1,51 @@ -include $(top_srcdir)/xbuild.include -if ! ENABLE_GNOMEPLATFORM -SKIP=y +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: 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 |