Author: robertj
Date: 2007-10-21 20:37:52 -0400 (Sun, 21 Oct 2007)
New Revision: 87881
Modified:
branches/robertj/xsp/ChangeLog
branches/robertj/xsp/src/Mono.WebServer.Apache/Makefile.am
branches/robertj/xsp/src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources
branches/robertj/xsp/src/Mono.WebServer.FastCgi/Makefile.am
branches/robertj/xsp/src/Mono.WebServer.FastCgi/Mono.WebServer.FastCgi.sources
branches/robertj/xsp/src/Mono.WebServer.XSP/Makefile.am
Log:
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
* src/*/*.am : Fix `make distclean'.
Modified: branches/robertj/xsp/ChangeLog
===================================================================
--- branches/robertj/xsp/ChangeLog 2007-10-21 23:18:48 UTC (rev 87880)
+++ branches/robertj/xsp/ChangeLog 2007-10-22 00:37:52 UTC (rev 87881)
@@ -1,5 +1,9 @@
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
+ * src/*/*.am : Fix `make distclean'.
+
+2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
+
* src/Mono.WebServer.FastCgi/Request.cs:
Reverted temporary hack for mod_fastcgi.
Modified: branches/robertj/xsp/src/Mono.WebServer.Apache/Makefile.am
===================================================================
--- branches/robertj/xsp/src/Mono.WebServer.Apache/Makefile.am 2007-10-21
23:18:48 UTC (rev 87880)
+++ branches/robertj/xsp/src/Mono.WebServer.Apache/Makefile.am 2007-10-22
00:37:52 UTC (rev 87881)
@@ -24,17 +24,20 @@
-r:Mono.Posix.dll -r:Mono.Security.dll
endif
-sources = $(addprefix $(srcdir)/, $(shell cat Mono.WebServer.Apache.sources))
-EXTRA_DIST = $(sources) AssemblyInfo.cs.in
+sources = $(shell cat $(srcdir)/Mono.WebServer.Apache.sources)
+build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
+EXTRA_DIST = $(sources) AssemblyInfo.cs.in Mono.WebServer.Apache.sources
+
+
mod-mono-server.exe: $(sources)
- $(MCS) $(MCSFLAGS) $(references) /d:MODMONO_SERVER /out:$@ $(sources)
- $(SN) -q -R $(builddir)/$@ $(builddir)/../mono.snk
+ $(MCS) $(MCSFLAGS) $(references) /out:$@ $(build_sources)
+ $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
mod-mono-server2.exe: $(sources)
- $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /d:MODMONO_SERVER /out:$@
$(sources)
- $(SN) -q -R $(builddir)/$@ $(builddir)/../mono.snk
+ $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ $(build_sources)
+ $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
$(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/mod-mono-server.exe
@@ -44,5 +47,5 @@
uninstall-local:
-for i in mod-mono-server mod-mono-server2 ; do \
- $(GACUTIL) $(GACUTIL_FLAGS) -u $i ; \
+ $(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
Modified:
branches/robertj/xsp/src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources
===================================================================
---
branches/robertj/xsp/src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources
2007-10-21 23:18:48 UTC (rev 87880)
+++
branches/robertj/xsp/src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources
2007-10-22 00:37:52 UTC (rev 87881)
@@ -1,5 +1,4 @@
ApplicationHost.cs
-AssemblyInfo.cs
main.cs
RequestBroker.cs
Request.cs
Modified: branches/robertj/xsp/src/Mono.WebServer.FastCgi/Makefile.am
===================================================================
--- branches/robertj/xsp/src/Mono.WebServer.FastCgi/Makefile.am 2007-10-21
23:18:48 UTC (rev 87880)
+++ branches/robertj/xsp/src/Mono.WebServer.FastCgi/Makefile.am 2007-10-22
00:37:52 UTC (rev 87881)
@@ -1,7 +1,6 @@
builddir=$(top_builddir)/src/Mono.WebServer.FastCgi
-MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ \
- -resource:ConfigurationManager.xml
+MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+
GACUTIL1=$(GACUTIL) -package 1.0
@@ -18,18 +17,23 @@
references = -r:System.Web.dll -r:../Mono.WebServer/Mono.WebServer.dll
-r:Mono.Security.dll -r:Mono.Posix.dll
references2 = -r:System.Web.dll -r:System.Configuration.dll
-r:../Mono.WebServer/Mono.WebServer2.dll -r:Mono.Security.dll -r:Mono.Posix.dll
-sources = $(addprefix $(srcdir)/, $(shell cat Mono.WebServer.FastCgi.sources))
-build_sources = $(addprefix $(srcdir)/, $(sources))
+sources = $(shell cat $(srcdir)/Mono.WebServer.FastCgi.sources)
+build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-EXTRA_DIST = $(sources) AssemblyInfo.cs.in
+resources = ConfigurationManager.xml
+build_resources = $(addprefix $(srcdir)/, $(resources))
+EXTRA_DIST = $(sources) AssemblyInfo.cs.in $(resources)
Mono.WebServer.FastCgi.sources
+
fastcgi-mono-server.exe: $(build_sources)
- $(MCS) $(MCSFLAGS) $(references) /out:$@ $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(builddir)/../mono.snk
+ $(MCS) $(MCSFLAGS) $(references) /out:$@ \
+ $(build_resources:%=-resource:%) $(build_sources)
+ $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
fastcgi-mono-server2.exe: $(build_sources)
- $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(builddir)/../mono.snk
+ $(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ \
+ $(build_resources:%=-resource:%) $(build_sources)
+ $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
$(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/fastcgi-mono-server.exe
@@ -40,5 +44,5 @@
uninstall-local:
-for i in fastcgi-mono-server fastcgi-mono-server2 ; do \
- $(GACUTIL) $(GACUTIL_FLAGS) -u $i ; \
+ $(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
Modified:
branches/robertj/xsp/src/Mono.WebServer.FastCgi/Mono.WebServer.FastCgi.sources
===================================================================
---
branches/robertj/xsp/src/Mono.WebServer.FastCgi/Mono.WebServer.FastCgi.sources
2007-10-21 23:18:48 UTC (rev 87880)
+++
branches/robertj/xsp/src/Mono.WebServer.FastCgi/Mono.WebServer.FastCgi.sources
2007-10-22 00:37:52 UTC (rev 87881)
@@ -1,5 +1,4 @@
ApplicationHost.cs
-AssemblyInfo.cs
BeginRequestBody.cs
ConfigurationManager.cs
Connection.cs
Modified: branches/robertj/xsp/src/Mono.WebServer.XSP/Makefile.am
===================================================================
--- branches/robertj/xsp/src/Mono.WebServer.XSP/Makefile.am 2007-10-21
23:18:48 UTC (rev 87880)
+++ branches/robertj/xsp/src/Mono.WebServer.XSP/Makefile.am 2007-10-22
00:37:52 UTC (rev 87881)
@@ -25,11 +25,11 @@
xsp.exe: $(build_sources)
$(MCS) $(MCSFLAGS) $(references) /out:$@ $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(builddir)/../mono.snk
+ $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
xsp2.exe: $(build_sources)
$(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(builddir)/../mono.snk
+ $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
$(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/xsp.exe
@@ -40,5 +40,5 @@
uninstall-local:
-for i in xsp xsp2 ; do \
- $(GACUTIL) $(GACUTIL_FLAGS) -u $i ; \
+ $(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
