pier 02/05/03 11:05:25
Modified: webapp Makedefs.in Makefile.in
webapp/apache-1.3 Makefile.in
webapp/apache-2.0 Makefile.in
Log:
Changes required to start integration with ANT (let's keep things all
together, right?)
Revision Changes Path
1.17 +4 -3 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makedefs.in 3 May 2002 16:16:23 -0000 1.16
+++ Makedefs.in 3 May 2002 18:05:24 -0000 1.17
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makedefs.in,v 1.16 2002/05/03 16:16:23 pier Exp $
+# @version $Id: Makedefs.in,v 1.17 2002/05/03 18:05:24 pier Exp $
.SUFFIXES: .c .o .lo
@@ -87,9 +87,10 @@
APR_DIR = @APR_DIR@
SRC_DIR = @SRC_DIR@
TGT_DIR = @TGT_DIR@
-OBJ_DIR = @TGT_DIR@/objects
-DST_DIR = @TGT_DIR@/distrib
+OBJ_DIR = @TGT_DIR@/build
+DST_DIR = @TGT_DIR@/distribution
TARBALL = webapp-module-$(WEBAPP_VERSION)
+MODFILE = mod_webapp.so
# Versions
APACHE_VERSION = @APACHE_VERSION@
1.31 +8 -11 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in 3 May 2002 16:16:23 -0000 1.30
+++ Makefile.in 3 May 2002 18:05:24 -0000 1.31
@@ -56,11 +56,11 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.30 2002/05/03 16:16:23 pier Exp $
+# @version $Id: Makefile.in,v 1.31 2002/05/03 18:05:24 pier Exp $
include @TGT_DIR@/Makedefs
-all: dist
+all: build
distclean: extra-clean
rm -f $(MODULE)/Makefile
@@ -70,21 +70,18 @@
rm -f DETAILS.txt
rm -fr $(DST_DIR)
-extra-build: $(OBJ_DIR) @EXTRA_BUILD@ build
+build: $(OBJ_DIR) @EXTRA_BUILD@ lib-build $(MODULE)-build
extra-clean: @EXTRA_CLEAN@ clean
-build: $(OBJ_DIR) lib-build $(MODULE)-build
-
clean: lib-clean $(MODULE)-clean
rm -rf $(OBJ_DIR)
-dist: $(DST_DIR) extra-build
- cp $(SRC_DIR)/LICENSE.txt $(DST_DIR)
- cp $(SRC_DIR)/README.txt $(DST_DIR)
- cp $(SRC_DIR)/INSTALL.txt $(DST_DIR)
- cp $(TGT_DIR)/DETAILS.txt $(DST_DIR)
- @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/$(MODULE)" SUBT="dist" subdir
+dist: $(DST_DIR) build
+ $(INSTALL) $(SRC_DIR)/LICENSE.txt $(DST_DIR)
+ $(INSTALL) $(SRC_DIR)/INSTALL.txt $(DST_DIR)
+ $(INSTALL) $(TGT_DIR)/DETAILS.txt $(DST_DIR)
+ $(INSTALL) $(TGT_DIR)/$(MODULE)/$(MODFILE) $(DST_DIR)
tarball: dist
cd $(TGT_DIR)
1.27 +6 -13 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.in 3 May 2002 16:13:40 -0000 1.26
+++ Makefile.in 3 May 2002 18:05:25 -0000 1.27
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.26 2002/05/03 16:13:40 pier Exp $
+# @version $Id: Makefile.in,v 1.27 2002/05/03 18:05:25 pier Exp $
LOCAL_TGT_DIR = @TGT_DIR@/apache-1.3
LOCAL_SRC_DIR = @SRC_DIR@/apache-1.3
@@ -64,29 +64,23 @@
SOURCE = mod_webapp.c
OBJECT = mod_webapp.o
-TARGET = libwebapp.so
-.PHONY: build clean dist
+.PHONY: build clean
-build: $(TARGET)
+build: $(MODFILE)
clean:
- rm -f $(TARGET)
+ rm -f $(MODFILE)
rm -f $(OBJECT)
@if test -h $(SOURCE) ; then \
echo rm -f $(SOURCE) ; \
rm -f $(SOURCE) ; \
fi
-dist:
- $(INSTALL) \
- $(LOCAL_TGT_DIR)/libwebapp.so \
- $(DST_DIR)/mod_webapp.so
-
$(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE)
ln -s $< $@
-$(TARGET): $(SOURCE)
+$(MODFILE): $(SOURCE)
$(APXS) -c -o $@ \
$(INCLUDES) $(LOCAL_INCLUDES) \
-Wc,"$(CPPFLAGS) $(CFLAGS)" \
@@ -97,7 +91,6 @@
# +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++
# SOURCE = mod_webapp.c
# OBJECT = mod_webapp.lo
-# TARGET = libwebapp.so
#
# $(OBJECT): $(LOCAL_SRC_DIR)/$(SOURCE)
# $(LIBTOOL) --mode=compile \
@@ -106,5 +99,5 @@
# $(CPPFLAGS) $(EXTRA_CPPFLAGS) \
# $(CFLAGS) $(EXTRA_CFLAGS)
#
-# $(TARGET): $(OBJECT)
+# $(MODFILE): $(OBJECT)
# $(APXS) -c -o $@ -L$(OBJ_DIR) -lapr $< $(OBJ_DIR)/*.o
1.8 +13 -21 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 3 May 2002 16:13:40 -0000 1.7
+++ Makefile.in 3 May 2002 18:05:25 -0000 1.8
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.7 2002/05/03 16:13:40 pier Exp $
+# @version $Id: Makefile.in,v 1.8 2002/05/03 18:05:25 pier Exp $
LOCAL_TGT_DIR = @TGT_DIR@/apache-2.0
LOCAL_SRC_DIR = @SRC_DIR@/apache-2.0
@@ -64,40 +64,32 @@
SOURCE = mod_webapp.c
OBJECT = mod_webapp.lo
-TARGET = libwebapp.la
-INSDIR = .inst
LIBDIR = .libs
+LIBFIL = libwebapp
+LIBEXT = .la
-.PHONY: build clean dist
+.PHONY: build clean
-build: $(TARGET)
+build: $(LIBFIL)$(LIBEXT)
+ $(INSTALL) \
+ $(LOCAL_TGT_DIR)/$(LIBDIR)/$(LIBFIL).so \
+ $(LOCAL_TGT_DIR)/$(MODFILE)
clean:
- rm -f $(TARGET)
rm -f $(OBJECT)
+ rm -f mod_webapp.o
+ rm -f mod_webapp.slo
@if test -h $(SOURCE) ; then \
echo rm -f $(SOURCE) ; \
rm -f $(SOURCE) ; \
fi
- rm -f *.o *.slo
- rm -rf $(INSDIR) $(LIBDIR)
-
-dist: build $(INSDIR)
- $(LIBTOOL) --mode=install \
- $(INSTALL) \
- $(LOCAL_TGT_DIR)/$(TARGET) \
- $(LOCAL_TGT_DIR)/$(INSDIR)
- $(INSTALL) \
- $(LOCAL_TGT_DIR)/$(INSDIR)/libwebapp.so \
- $(DST_DIR)/mod_webapp.so
-
-$(INSDIR):
- mkdir $(INSDIR)
+ rm -f $(LIBFIL).*
+ rm -rf $(LIBDIR)
$(SOURCE): $(LOCAL_SRC_DIR)/$(SOURCE)
ln -s "$<" "$@"
-$(TARGET): $(SOURCE)
+$(LIBFIL)$(LIBEXT): $(SOURCE)
$(APXS) -c -o $@ \
$(INCLUDES) \
$(OBJ_DIR)/*.lo $<
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
