pier 02/05/13 16:25:09
Modified: webapp Makedefs.in Makefile.in
webapp/apache-1.3 Makefile.in
Log:
Use the same "build" directory structure for ANT and MAKE.
Revision Changes Path
1.18 +5 -3 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makedefs.in 3 May 2002 18:05:24 -0000 1.17
+++ Makedefs.in 13 May 2002 23:25:09 -0000 1.18
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makedefs.in,v 1.17 2002/05/03 18:05:24 pier Exp $
+# @version $Id: Makedefs.in,v 1.18 2002/05/13 23:25:09 pier Exp $
.SUFFIXES: .c .o .lo
@@ -87,8 +87,10 @@
APR_DIR = @APR_DIR@
SRC_DIR = @SRC_DIR@
TGT_DIR = @TGT_DIR@
-OBJ_DIR = @TGT_DIR@/build
-DST_DIR = @TGT_DIR@/distribution
+BLD_DIR = @TGT_DIR@/build
+OBJ_DIR = $(BLD_DIR)/objs
+LIB_DIR = $(BLD_DIR)/libs
+DST_DIR = @TGT_DIR@/dist
TARBALL = webapp-module-$(WEBAPP_VERSION)
MODFILE = mod_webapp.so
1.32 +11 -5 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.in 3 May 2002 18:05:24 -0000 1.31
+++ Makefile.in 13 May 2002 23:25:09 -0000 1.32
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.31 2002/05/03 18:05:24 pier Exp $
+# @version $Id: Makefile.in,v 1.32 2002/05/13 23:25:09 pier Exp $
include @TGT_DIR@/Makedefs
@@ -92,9 +92,15 @@
gzip -9f $(TARBALL).tar
rm -rf $(TARBALL)
-$(OBJ_DIR):
+$(LIB_DIR): $(BLD_DIR)
+ mkdir $(LIB_DIR)
+
+$(OBJ_DIR): $(BLD_DIR)
mkdir $(OBJ_DIR)
+$(BLD_DIR):
+ mkdir $(BLD_DIR)
+
$(DST_DIR):
mkdir $(DST_DIR)
@@ -110,11 +116,11 @@
lib-clean:
@$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/lib" SUBT="clean" subdir
-apr-build:
+apr-build: $(LIB_DIR)
@$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="all" subdir
$(LIBTOOL) --mode=install \
- cp $(APR_DIR)/libapr.la $(OBJ_DIR)/libapr.la
- $(LIBTOOL) --mode=finish $(OBJ_DIR)
+ cp $(APR_DIR)/libapr.la $(LIB_DIR)/libapr.la
+ $(LIBTOOL) --mode=finish $(LIB_DIR)
apr-clean:
@$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="clean" subdir
1.28 +2 -2 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.in 3 May 2002 18:05:25 -0000 1.27
+++ Makefile.in 13 May 2002 23:25:09 -0000 1.28
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.27 2002/05/03 18:05:25 pier Exp $
+# @version $Id: Makefile.in,v 1.28 2002/05/13 23:25:09 pier Exp $
LOCAL_TGT_DIR = @TGT_DIR@/apache-1.3
LOCAL_SRC_DIR = @SRC_DIR@/apache-1.3
@@ -85,7 +85,7 @@
$(INCLUDES) $(LOCAL_INCLUDES) \
-Wc,"$(CPPFLAGS) $(CFLAGS)" \
-Wl,"$(LDFLAGS) $(LIBS)" \
- -L$(OBJ_DIR) -lapr \
+ -L$(LIB_DIR) -lapr \
$(OBJ_DIR)/*.o $<
# +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
