Author: mhutch
Date: 2007-09-14 07:44:49 -0400 (Fri, 14 Sep 2007)
New Revision: 85795
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
trunk/monodevelop/Extras/AspNetAddIn/Makefile.am
trunk/monodevelop/Extras/CSharpBinding/Makefile.am
Log:
Misc distcheck build fixes
Modified: trunk/monodevelop/Core/src/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core/Makefile.am 2007-09-14
11:36:44 UTC (rev 85794)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core/Makefile.am 2007-09-14
11:44:49 UTC (rev 85795)
@@ -90,8 +90,8 @@
sed -e 's,@''prefix@,$(prefix),g' $(srcdir)/[EMAIL PROTECTED] > [EMAIL
PROTECTED]
mv [EMAIL PROTECTED] $@
-$(ASSEMBLY): $(build_sources) $(RES)
- $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS)
$(RES:%=/resource:%) $(build_sources)
+$(ASSEMBLY): $(build_sources) $(build_resources)
+ $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS)
$(build_resources:%=/resource:%) $(build_sources)
assemblydir = $(MD_ASSEMBLY_DIR)
assembly_DATA = $(ASSEMBLY)
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-09-14
11:36:44 UTC (rev 85794)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-09-14
11:44:49 UTC (rev 85795)
@@ -241,8 +241,8 @@
all: $(ASSEMBLY)
-$(ASSEMBLY): $(build_sources)
- $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS)
$(RES:%=/resource:%) $(build_sources) \
+$(ASSEMBLY): $(build_sources) $(build_resources)
+ $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS)
$(build_resources:%=/resource:%) $(build_sources) \
&& cp $(CONFIG) $(top_builddir)/build/bin
assemblydir = $(MD_ASSEMBLY_DIR)
Modified: trunk/monodevelop/Extras/AspNetAddIn/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Makefile.am 2007-09-14 11:36:44 UTC
(rev 85794)
+++ trunk/monodevelop/Extras/AspNetAddIn/Makefile.am 2007-09-14 11:44:49 UTC
(rev 85795)
@@ -86,16 +86,8 @@
Templates/WebHandler-Empty.xft.xml \
Templates/WebService-CodeBehind.xft.xml \
Templates/WebService-Empty.xft.xml
-
-TESTFILES = \
- Test/Test.cs
-TESTDLLS = \
- $(NUNIT_LIBS)
-TESTASSEMBLY = $(top_builddir)/build/bin/AspNetAddIn.Test.dll
-
-
if ENABLE_ASPNET
all: $(ASSEMBLY)
else
@@ -107,13 +99,8 @@
$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \
$(build_resources:%=/resource:%) $(build_sources)
-check: all $(TESTASSEMBLY)
- MONO_PATH=../../build/AddIns nunit-console $(TESTASSEMBLY)
+check: all
-$(TESTASSEMBLY) : $(build_test_sources) $(build_resources)
- $(CSC) $(CSC_FLAGS) -debug -codepage:utf8 -out:$@ -target:library
$(DLLS) $(TESTDLLS) /r:$(ASSEMBLY) \
- $(monodoc_libflags) $(build_resources:%=/resource:%)
$(build_test_sources)
-
if ENABLE_ASPNET
csharpbindinglibdir = $(MD_ADDIN_DIR)/AspNetAddIn
csharpbindinglib_DATA = $(ASSEMBLY)
Modified: trunk/monodevelop/Extras/CSharpBinding/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Makefile.am 2007-09-14 11:36:44 UTC
(rev 85794)
+++ trunk/monodevelop/Extras/CSharpBinding/Makefile.am 2007-09-14 11:44:49 UTC
(rev 85795)
@@ -134,11 +134,12 @@
$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \
$(build_resources:%=/resource:%) $(build_sources)
-check: all $(TESTASSEMBLY)
- MONO_PATH=../../build/AddIns nunit-console $(TESTASSEMBLY)
+check: all $(TESTASSEMBLY)
+ MONO_PATH=$(top_builddir)/build/AddIns nunit-console $(TESTASSEMBLY)
+
$(TESTASSEMBLY) : $(build_test_sources) $(build_resources)
- $(CSC) $(CSC_FLAGS) -debug -codepage:utf8 -out:$@ -target:library
$(DLLS) $(TESTDLLS) /r:$(ASSEMBLY) \
+ $(CSC) $(CSC_FLAGS) -debug -codepage:utf8 -out:$@ -target:library
$(DLLS) $(TESTDLLS) $(REFS) /r:$(ASSEMBLY) \
$(monodoc_libflags) $(build_resources:%=/resource:%)
$(build_test_sources)
parse: $(PARSE)
@@ -147,7 +148,7 @@
$(CSC) -out:$@ parse.cs $(REFS) -r:$(ASSEMBLY)
run-parse-test: $(PARSE)
-
MONO_PATH=../../../../../build/AddIns/BackendBindings/:../../../../../build/bin/
mono $(PARSE) .
+
MONO_PATH=$(top_builddir)/build/AddIns/BackendBindings/:$(top_builddir)/build/bin/
mono $(PARSE) .
csharpbindinglibdir = $(MD_ADDIN_DIR)/BackendBindings
csharpbindinglib_DATA = $(ASSEMBLY)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
