Author: lluis
Date: 2007-03-23 15:28:12 -0500 (Fri, 23 Mar 2007)
New Revision: 74919
Added:
trunk/mono-addins/makefile-sample.include
Modified:
trunk/mono-addins/ChangeLog
trunk/mono-addins/Makefile.am
trunk/mono-addins/Samples/TextEditor.CompilerService.CSharp/Makefile.am
trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am
trunk/mono-addins/Samples/TextEditor/Makefile.am
trunk/mono-addins/Samples/TextEditorLib/Makefile.am
trunk/mono-addins/Samples/WriterService.SampleExtender/Makefile.am
trunk/mono-addins/Samples/WriterService/Makefile.am
trunk/mono-addins/Samples/WriterServiceHost/Makefile.am
trunk/mono-addins/Test/CommandExtension/Makefile.am
trunk/mono-addins/Test/FileContentExtension/Makefile.am
trunk/mono-addins/Test/FileExtender/Makefile.am
trunk/mono-addins/Test/HelloWorldExtension/Makefile.am
trunk/mono-addins/Test/SystemInfoExtension/Makefile.am
trunk/mono-addins/Test/UnitTests/Makefile.am
Log:
Avoid installing assemblies generated by samples and tests.
Modified: trunk/mono-addins/ChangeLog
===================================================================
--- trunk/mono-addins/ChangeLog 2007-03-23 20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/ChangeLog 2007-03-23 20:28:12 UTC (rev 74919)
@@ -1,5 +1,9 @@
2007-03-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+ Avoid installing assemblies generated by samples and tests.
+
+2007-03-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
Added missing makefiles.
2007-03-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
Modified: trunk/mono-addins/Makefile.am
===================================================================
--- trunk/mono-addins/Makefile.am 2007-03-23 20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Makefile.am 2007-03-23 20:28:12 UTC (rev 74919)
@@ -1,5 +1,5 @@
-SUBDIRS = Mono.Addins Mono.Addins.Setup Mono.Addins.Gui mautil
+SUBDIRS = Mono.Addins Mono.Addins.Setup Mono.Addins.Gui mautil Test Samples
DOCFILES = \
$(top_builddir)/bin/Mono.Addins.dll \
Modified: trunk/mono-addins/Samples/TextEditor/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor/Makefile.am 2007-03-23 20:20:17 UTC
(rev 74918)
+++ trunk/mono-addins/Samples/TextEditor/Makefile.am 2007-03-23 20:28:12 UTC
(rev 74919)
@@ -40,5 +40,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_GUI
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
2007-03-23 20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
2007-03-23 20:28:12 UTC (rev 74919)
@@ -39,5 +39,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_GUI
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified:
trunk/mono-addins/Samples/TextEditor.CompilerService.CSharp/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor.CompilerService.CSharp/Makefile.am
2007-03-23 20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Samples/TextEditor.CompilerService.CSharp/Makefile.am
2007-03-23 20:28:12 UTC (rev 74919)
@@ -34,5 +34,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_GUI
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am 2007-03-23
20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am 2007-03-23
20:28:12 UTC (rev 74919)
@@ -36,5 +36,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_GUI
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Samples/TextEditorLib/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditorLib/Makefile.am 2007-03-23 20:20:17 UTC
(rev 74918)
+++ trunk/mono-addins/Samples/TextEditorLib/Makefile.am 2007-03-23 20:28:12 UTC
(rev 74919)
@@ -62,5 +62,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_GUI
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Samples/WriterService/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/WriterService/Makefile.am 2007-03-23 20:20:17 UTC
(rev 74918)
+++ trunk/mono-addins/Samples/WriterService/Makefile.am 2007-03-23 20:28:12 UTC
(rev 74919)
@@ -31,4 +31,4 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
Modified: trunk/mono-addins/Samples/WriterService.SampleExtender/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/WriterService.SampleExtender/Makefile.am
2007-03-23 20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Samples/WriterService.SampleExtender/Makefile.am
2007-03-23 20:28:12 UTC (rev 74919)
@@ -30,4 +30,4 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
Modified: trunk/mono-addins/Samples/WriterServiceHost/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/WriterServiceHost/Makefile.am 2007-03-23
20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Samples/WriterServiceHost/Makefile.am 2007-03-23
20:28:12 UTC (rev 74919)
@@ -30,4 +30,4 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
Modified: trunk/mono-addins/Test/CommandExtension/Makefile.am
===================================================================
--- trunk/mono-addins/Test/CommandExtension/Makefile.am 2007-03-23 20:20:17 UTC
(rev 74918)
+++ trunk/mono-addins/Test/CommandExtension/Makefile.am 2007-03-23 20:28:12 UTC
(rev 74919)
@@ -33,5 +33,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_TESTS
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Test/FileContentExtension/Makefile.am
===================================================================
--- trunk/mono-addins/Test/FileContentExtension/Makefile.am 2007-03-23
20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Test/FileContentExtension/Makefile.am 2007-03-23
20:28:12 UTC (rev 74919)
@@ -35,5 +35,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_TESTS
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Test/FileExtender/Makefile.am
===================================================================
--- trunk/mono-addins/Test/FileExtender/Makefile.am 2007-03-23 20:20:17 UTC
(rev 74918)
+++ trunk/mono-addins/Test/FileExtender/Makefile.am 2007-03-23 20:28:12 UTC
(rev 74919)
@@ -34,5 +34,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_TESTS
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Test/HelloWorldExtension/Makefile.am
===================================================================
--- trunk/mono-addins/Test/HelloWorldExtension/Makefile.am 2007-03-23
20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Test/HelloWorldExtension/Makefile.am 2007-03-23
20:28:12 UTC (rev 74919)
@@ -33,5 +33,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_TESTS
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Test/SystemInfoExtension/Makefile.am
===================================================================
--- trunk/mono-addins/Test/SystemInfoExtension/Makefile.am 2007-03-23
20:20:17 UTC (rev 74918)
+++ trunk/mono-addins/Test/SystemInfoExtension/Makefile.am 2007-03-23
20:28:12 UTC (rev 74919)
@@ -35,5 +35,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_TESTS
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Modified: trunk/mono-addins/Test/UnitTests/Makefile.am
===================================================================
--- trunk/mono-addins/Test/UnitTests/Makefile.am 2007-03-23 20:20:17 UTC
(rev 74918)
+++ trunk/mono-addins/Test/UnitTests/Makefile.am 2007-03-23 20:28:12 UTC
(rev 74919)
@@ -5,6 +5,7 @@
PROJECT_REFERENCES = \
../../bin/Mono.Addins.dll
BUILD_DIR = ./bin/Debug
+NOINSTALL=yes
if ENABLE_TESTS
all: $(ASSEMBLY)
@@ -46,5 +47,5 @@
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@
-target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed)
$(build_references_ref)
if ENABLE_TESTS
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/makefile-sample.include
endif
Added: trunk/mono-addins/makefile-sample.include
===================================================================
--- trunk/mono-addins/makefile-sample.include 2007-03-23 20:20:17 UTC (rev
74918)
+++ trunk/mono-addins/makefile-sample.include 2007-03-23 20:28:12 UTC (rev
74919)
@@ -0,0 +1,19 @@
+build_sources = $(addprefix $(srcdir)/, $(FILES) $(GENERATED_FILES))
+build_resources = $(addprefix $(srcdir)/, $(RESOURCES))
+build_resources_embed = $(foreach res,$(build_resources), $(addprefix
-resource:,$(res)),$(RESOURCES_PREFIX)$(notdir $(res)))
+
+build_references_ref = $(REFERENCES)
+build_references_ref += $(foreach ref, $(DLL_REFERENCES), -r:$(ref))
+build_references_ref += $(foreach ref, $(PROJECT_REFERENCES), -r:$(ref))
+
+pc_files = $(PC_FILES_IN:.pc.in=.pc)
+
+build_datafiles = $(addprefix $(BUILD_DIR)/, $(DATA_FILES))
+
+$(build_datafiles): $(BUILD_DIR)/% : $(addprefix $(srcdir)/, %)
+ mkdir -p $(dir $@)
+ cp $< $@
+
+EXTRA_DIST = $(FILES) $(GENERATED_FILES) $(RESOURCES) $(ASSEMBLY_WRAPPER_IN)
$(EXTRAS) $(DATA_FILES) $(PC_FILES_IN)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DLL_REFERENCES)
+DISTCLEANFILES = $(GENERATED_FILES) $(build_datafiles) $(pc_files)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
