You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by wr...@apache.org on 2005/07/12 21:38:18 UTC
cvs commit: jakarta-tomcat-connectors/jk/support jk_apache_static.m4
wrowe 2005/07/12 12:38:18
Modified: jk/native configure.in
jk/native/apache-1.3 Makefile.netware NWGNUmakefile.mak
jk/native/apache-2.0 NWGNUmakefile
jk/native/jni Makefile.netware
jk/native/netscape Makefile.netware
jk/native2/server/apache2 NWGNUmakefile
jk/support jk_apache_static.m4
Removed: common/build apache.m4 get_ver.awk os_apache.m4
Log:
Relocate apache.m4 get_ver.awk os_apache.m4 resources from
common/build into jk/support. It appears apache.m4 may no
longer be in use from a simple grep of the source tree.
The new copies in jk/support already include revision history
but no tags at that location.
Revision Changes Path
1.50 +2 -2 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- configure.in 6 Jul 2005 13:36:55 -0000 1.49
+++ configure.in 12 Jul 2005 19:38:18 -0000 1.50
@@ -199,7 +199,7 @@
dnl Apache-2.0 needs the os subdirectory to include os.h
dnl this include is copy from os/config.m4
-sinclude(../../common/build/os_apache.m4)
+sinclude(../support/os_apache.m4)
dnl it is copied from the configure of JServ ;=)
dnl and adapted.
1.8 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware
Index: Makefile.netware
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.netware 10 Jun 2005 16:24:35 -0000 1.7
+++ Makefile.netware 12 Jul 2005 19:38:18 -0000 1.8
@@ -165,7 +165,7 @@
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(AP_HOME)/src/include/httpd.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../../common/build/get_ver.awk $< $(AP_HOME)/src/include/httpd.h > $@
+ @awk -f ../../support/get_ver.awk $< $(AP_HOME)/src/include/httpd.h > $@
dist: all
-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
1.3 +1 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak
Index: NWGNUmakefile.mak
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/NWGNUmakefile.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NWGNUmakefile.mak 13 Feb 2005 22:28:07 -0000 1.2
+++ NWGNUmakefile.mak 12 Jul 2005 19:38:18 -0000 1.3
@@ -273,7 +273,7 @@
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(SRC)/include/httpd.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../../common/build/get_ver.awk $< $(SRC)/include/httpd.h > $@
+ @awk -f ../../support/get_ver.awk $< $(SRC)/include/httpd.h > $@
# Include the version info retrieved from jk_version.h
-include $(OBJDIR)/version.inc
1.8 +1 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NWGNUmakefile 13 Feb 2005 12:25:04 -0000 1.7
+++ NWGNUmakefile 12 Jul 2005 19:38:18 -0000 1.8
@@ -297,7 +297,7 @@
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../../common/build/get_ver.awk $< > $@
+ @awk -f ../../support/get_ver.awk $< > $@
#
1.5 +1 -1 jakarta-tomcat-connectors/jk/native/jni/Makefile.netware
Index: Makefile.netware
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/jni/Makefile.netware,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.netware 28 Jul 2004 14:24:48 -0000 1.4
+++ Makefile.netware 12 Jul 2005 19:38:18 -0000 1.5
@@ -150,7 +150,7 @@
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../../common/build/get_ver.awk $< > $@
+ @awk -f ../../support/get_ver.awk $< > $@
dist: all
-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
1.6 +1 -1 jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware
Index: Makefile.netware
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.netware,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.netware 1 Apr 2005 02:58:41 -0000 1.5
+++ Makefile.netware 12 Jul 2005 19:38:18 -0000 1.6
@@ -160,7 +160,7 @@
$(OBJDIR)/version.inc: $(JKCOMMON)/jk_version.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../../common/build/get_ver.awk $< > $@
+ @awk -f ../../support/get_ver.awk $< > $@
dist: all
-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
1.5 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NWGNUmakefile 9 Apr 2004 20:00:18 -0000 1.4
+++ NWGNUmakefile 12 Jul 2005 19:38:18 -0000 1.5
@@ -333,7 +333,7 @@
$(OBJDIR)/version.inc: $(JKINCLUDE)/jk_global.h $(OBJDIR)
@echo Creating $@
- @awk -f ../../../../common/build/get_ver.awk $< > $@
+ @awk -f ../../../support/get_ver.awk $< > $@
#
# Include the version info retrieved from jk_global.h
1.5 +2 -2 jakarta-tomcat-connectors/jk/support/jk_apache_static.m4
Index: jk_apache_static.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apache_static.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_apache_static.m4 24 Feb 2004 08:41:40 -0000 1.4
+++ jk_apache_static.m4 12 Jul 2005 19:38:18 -0000 1.5
@@ -24,7 +24,7 @@
dnl Apache-2.0 needs the os subdirectory to include os.h
dnl this include is copy from os/config.m4
-sinclude(../../common/build/os_apache.m4)
+sinclude(os_apache.m4)
dnl --------------------------------------------------------------------------
dnl JK_APACHE_STATIC
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org