cvs commit: jakarta-tomcat-connectors/webapp Makefile.in

[pier]

pier        02/05/01 14:26:28

  Modified:    webapp   Makefile.in
  Log:
  Reorganized how we make dependancies on libraries...
  
  Revision  Changes    Path
  1.29      +14 -16    jakarta-tomcat-connectors/webapp/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Makefile.in       1 May 2002 15:27:51 -0000       1.28
  +++ Makefile.in       1 May 2002 21:26:28 -0000       1.29
  @@ -56,7 +56,7 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:[EMAIL PROTECTED]>
  -# @version $Id: Makefile.in,v 1.28 2002/05/01 15:27:51 pier Exp $
  +# @version $Id: Makefile.in,v 1.29 2002/05/01 21:26:28 pier Exp $
   
   include @TGT_DIR@/Makedefs
   
  @@ -68,10 +68,17 @@
        rm -f Makedefs
        rm -f Makefile
   
  -extra-build: @EXTRA_BUILD@ build
  -extra-clean: @EXTRA_BUILD@ clean
  -build: lib-build $(MODULE)-build
  +extra-build: $(OBJ_DIR) @EXTRA_BUILD@ build
  +
  +extra-clean: @EXTRA_CLEAN@ clean
  +
  +build: $(OBJ_DIR) lib-build $(MODULE)-build
  +
   clean: lib-clean $(MODULE)-clean
  +     rm -rf $(OBJ_DIR)/*
  +
  +$(OBJ_DIR):
  +     mkdir $(OBJ_DIR)
   
   $(MODULE)-build:
        @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/$(MODULE)" SUBT="build" subdir
  @@ -81,27 +88,18 @@
   
   lib-build:
        @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/lib" SUBT="build" subdir
  -     @echo "$(MAKE): Installing library libwebapp.la"
  -     $(LIBTOOL) --mode=install cp \
  -       $(TGT_DIR)/lib/libwebapp.la \
  -       $(TGT_DIR)/libwebapp.la > /dev/null
   
   lib-clean:
        @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/lib" SUBT="clean" subdir
  -     rm -f libwebapp.la
  -     rm -f libwebapp.a
   
   apr-build:
        @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="all" subdir
  -     @echo "$(MAKE): Installing library libapr.la"
  -     $(LIBTOOL) --mode=install cp \
  -       $(APR_DIR)/libapr.la \
  -       $(TGT_DIR)/libapr.la > /dev/null
  +     $(LIBTOOL) --mode=install \
  +       cp $(APR_DIR)/libapr.la $(OBJ_DIR)/libapr.la
  +     $(LIBTOOL) --mode=finish $(OBJ_DIR)
   
   apr-clean:
        @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="clean" subdir
  -     rm -f libapr.la
  -     rm -f libapr.a
   
   subdir:
        @echo ""
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>