You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2002/05/01 23:23:19 UTC
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 Makefile.in
pier 02/05/01 14:23:19
Modified: webapp/apache-2.0 Makefile.in
Log:
New makefile for Apache 2.0 (it _WORKS_ ! - in theory)
Revision Changes Path
1.6 +25 -26 jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1 Nov 2001 22:20:51 -0000 1.5
+++ Makefile.in 1 May 2002 21:23:19 -0000 1.6
@@ -56,35 +56,34 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@betaversion.org>
-# @version $Id: Makefile.in,v 1.5 2001/11/01 22:20:51 pier Exp $
+# @version $Id: Makefile.in,v 1.6 2002/05/01 21:23:19 pier Exp $
-include @SRCDIR@/Makedefs
+LOCAL_TGT_DIR = @TGT_DIR@/apache-2.0
+LOCAL_SRC_DIR = @SRC_DIR@/apache-2.0
+include @TGT_DIR@/Makedefs
-APXS = @APXS@
+SOURCE = mod_webapp.c
+OBJECT = mod_webapp.lo
+TARGET = libwebapp.la
-MODULE = mod_webapp.la
+.PHONY: build clean
-all: $(MODULE)
-build: $(MODULE)
-
-mod_webapp.la: mod_webapp.c
- @$(ECHO) Compiling and Linking Apache 2.0 WebApp Module
- $(APXS) -I../include -c -L ../lib -lwebapp mod_webapp.c
-
-install: mod_webapp.la
- $(APXS) -i mod_webapp.la
+build: $(TARGET)
clean:
- @for ENTRY in *.o *.lo $(MODULE) .libs ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
+ rm -f $(TARGET)
+ rm -f $(OBJECT)
+ @if test -h $(SOURCE) ; then \
+ echo rm -f $(SOURCE) ; \
+ rm -f $(SOURCE) ; \
+ fi
+ rm -f *.o *.slo
+ rm -rf .libs
+
+$(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE)
+ ln -s "$<" "$@"
+
+$(TARGET): $(SOURCE)
+ $(APXS) -c -o $@ \
+ $(INCLUDES) \
+ $(OBJ_DIR)/*.lo $<
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 Makefile.in
Posted by Punky Tse <pu...@mac.com>.
Pier,
Thanks! Before that, I would just like to send you some patches on 2.0
side. But you are faster than me. And it builds prefectly on my Linux
box now.
Questions and Comments:
- I notice that the mod_webapp module name changed from mod_webapp.so to
libwebapp.so. (I spent some time to notice it ;-) )
- "install" target removed. Is it temporary or confirmed?
- Building from CVS requires autoconf 2.52. Any reason for this? If so
I have to upgrade many of my build environments (Linux, Darwin and FreeBSD)
- What is the version of mod_webapp? In previous mail you said that it
is in beta (0.9?). Remember the verison patches I sent you....? ;-)
I will try to see if it builds on FreeBSD (may be Darwin) tonight. It
is one of my private milestone ;-).
Having seeing your name in commits and bug reports actively these day, I
am very much believed that you are back. So, keep on.
Punky
pier@apache.org wrote:
> pier 02/05/01 14:23:19
>
> Modified: webapp/apache-2.0 Makefile.in
> Log:
> New makefile for Apache 2.0 (it _WORKS_ ! - in theory)
>
> Revision Changes Path
> 1.6 +25 -26 jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in
>
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- Makefile.in 1 Nov 2001 22:20:51 -0000 1.5
> +++ Makefile.in 1 May 2002 21:23:19 -0000 1.6
> @@ -56,35 +56,34 @@
> # ========================================================================= #
>
> # @author Pier Fumagalli <ma...@betaversion.org>
> -# @version $Id: Makefile.in,v 1.5 2001/11/01 22:20:51 pier Exp $
> +# @version $Id: Makefile.in,v 1.6 2002/05/01 21:23:19 pier Exp $
>
> -include @SRCDIR@/Makedefs
> +LOCAL_TGT_DIR = @TGT_DIR@/apache-2.0
> +LOCAL_SRC_DIR = @SRC_DIR@/apache-2.0
> +include @TGT_DIR@/Makedefs
>
> -APXS = @APXS@
> +SOURCE = mod_webapp.c
> +OBJECT = mod_webapp.lo
> +TARGET = libwebapp.la
>
> -MODULE = mod_webapp.la
> +.PHONY: build clean
>
> -all: $(MODULE)
> -build: $(MODULE)
> -
> -mod_webapp.la: mod_webapp.c
> - @$(ECHO) Compiling and Linking Apache 2.0 WebApp Module
> - $(APXS) -I../include -c -L ../lib -lwebapp mod_webapp.c
> -
> -install: mod_webapp.la
> - $(APXS) -i mod_webapp.la
> +build: $(TARGET)
>
> clean:
> - @for ENTRY in *.o *.lo $(MODULE) .libs ; \
> - do \
> - if $(TEST) -f $${ENTRY} ; \
> - then \
> - $(ECHO) Removing file $${ENTRY} ; \
> - $(RM) -f $${ENTRY} ; \
> - fi ; \
> - if $(TEST) -d $${ENTRY} ; \
> - then \
> - $(ECHO) Removing directory $${ENTRY} ; \
> - $(RM) -rf $${ENTRY} ; \
> - fi ; \
> - done
> + rm -f $(TARGET)
> + rm -f $(OBJECT)
> + @if test -h $(SOURCE) ; then \
> + echo rm -f $(SOURCE) ; \
> + rm -f $(SOURCE) ; \
> + fi
> + rm -f *.o *.slo
> + rm -rf .libs
> +
> +$(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE)
> + ln -s "$<" "$@"
> +
> +$(TARGET): $(SOURCE)
> + $(APXS) -c -o $@ \
> + $(INCLUDES) \
> + $(OBJ_DIR)/*.lo $<
>
>
>
>
> --
> To unsubscribe, e-mail: <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>