tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.win
Date Sat, 11 Aug 2001 03:27:02 GMT
pier        01/08/10 20:27:02

  Modified:    webapp   Makefile.win
               webapp/apache-1.3 Makefile.win
               webapp/lib Makefile.win
  Log:
  Updated makefiles to successfully build mod_webapp.dll
  
  Revision  Changes    Path
  1.3       +11 -17    jakarta-tomcat-connectors/webapp/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.win,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.win	2001/08/11 02:26:14	1.2
  +++ Makefile.win	2001/08/11 03:27:02	1.3
  @@ -56,23 +56,14 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  -# @version $Id: Makefile.win,v 1.2 2001/08/11 02:26:14 pier Exp $
  +# @version $Id: Makefile.win,v 1.3 2001/08/11 03:27:02 pier Exp $
   
   # Analyze and normalyze the DEBUG compilation flag
   !IF "$(DEBUG)" == "true"
  -DEBUG = true
  -APRCFG = apr - Win32 Debug
  -APRDIR = LibD
  +APRCFG = libapr - Win32 Debug
   !ELSE
  -!IF "$(DEBUG)" == "TRUE"
  -DEBUG = true
  -APRCFG = apr - Win32 Debug
  -APRDIR = LibD
  -!ELSE
   DEBUG = false
  -APRCFG = apr - Win32 Release
  -APRDIR = LibR
  -!ENDIF
  +APRCFG = libapr - Win32 Release
   !ENDIF
   
   # Makefile rules
  @@ -82,14 +73,17 @@
       -@erase localmake.bat
   
   apr-all: localmake.bat
  -    @localmake.bat .\apr /f apr.mak "CFG=$(APRCFG)" all
  -    copy .\apr\$(APRDIR)\apr.lib .\apr\apr.lib
  -    copy .\apr\$(APRDIR)\apr.idb .\apr\apr.idb
  +    @localmake.bat .\apr /f libapr.mak "CFG=$(APRCFG)" all
  +    @echo DEBUG IS -$(DEBUG)-
  +!IF "$(DEBUG)" == "true"
  +    copy .\apr\Debug\libapr.dll .\apr\libapr.dll
  +!ELSE
  +    copy .\apr\Release\libapr.dll .\apr\libapr.dll
  +!ENDIF
   
   apr-clean: localmake.bat
  -    @localmake.bat .\apr /f apr.mak "CFG=$(APRCFG)" clean
  +    @localmake.bat .\apr /f libapr.mak "CFG=$(APRCFG)" clean
       -@erase .\apr\apr.lib
  -    -@erase .\apr\apr.idb
   
   local-all: localmake.bat
       @localmake.bat .\lib /f Makefile.win "DEBUG=$(DEBUG)" all
  
  
  
  1.2       +49 -10    jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.win,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.win	2001/08/11 02:06:14	1.1
  +++ Makefile.win	2001/08/11 03:27:02	1.2
  @@ -56,13 +56,13 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  -# @version $Id: Makefile.win,v 1.1 2001/08/11 02:06:14 pier Exp $
  +# @version $Id: Makefile.win,v 1.2 2001/08/11 03:27:02 pier Exp $
   
   # All our object files
   OBJS =   mod_webapp.obj
   
   # Files created by this script (for removal only)
  -GENS =   webapp.idb
  +GENS =   mod_webapp.idb
   
   # The target library
   LIBS =   mod_webapp.dll
  @@ -73,20 +73,59 @@
   
   # Flags for the C compiler
   CFLAGS = /nologo \
  +         /W3 \
  +!IF "$(DEBUG)" == "true"
  +         /MDd \
  +         /GX \
  +         /Zi \
  +         /Od \
  +         /Yd \
  +         /D"DEBUG" \
  +!ELSE
   	     /MD \
  -	     /W3 \
   	     /O2 \
  -	     /I"." \
  -	     /I"..\include" \
  -	     /I"..\apr\include" \
  -	     /I"$(APACHE)\Include" \
  +!ENDIF
  +	     /I "." \
  +	     /I "..\include" \
  +	     /I "..\apr\include" \
  +	     /I "$(APACHE)\include" \
   	     /D"WIN32" \
  -	     /Fd".\webapp" \
  +	     /Fd".\mod_webapp" \
   	     /FD
   
   # Flags for the library linker
  -LFLAGS = -lib \
  -         /nologo
  +LFLAGS = /nologo \
  +         apachecore.lib \
  +         libapr.lib \
  +         webapp.lib \
  +         advapi32.lib \
  +         comdlg32.lib \
  +         gdi32.lib \
  +         kernel32.lib \
  +         odbc32.lib \
  +         odbccp32.lib \
  +         ole32.lib \
  +         oleaut32.lib \
  +         shell32.lib \
  +         user32.lib \
  +         uuid.lib \
  +         winspool.lib \
  +         ws2_32.lib \
  +         /nologo \
  +         /dll \
  +         /pdb:"mod_webapp.pdb" \
  +         /machine:I386 \
  +         /implib:"mod_webapp.lib" \
  +         /libpath:"..\lib" \
  +         /libpath:"$(APACHE)\libexec" \
  +!IF "$(DEBUG)" == "true"
  +         /libpath:"..\apr\Debug" \
  +         /debug \
  +         /pdbtype:sept \
  +!ELSE
  +         /libpath:"..\apr\Release" \
  +!ENDIF
  +         /incremental:no
   
   # Makefile rules
   all: $(LIBS)
  
  
  
  1.2       +4 -3      jakarta-tomcat-connectors/webapp/lib/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.win,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.win	2001/08/11 02:06:14	1.1
  +++ Makefile.win	2001/08/11 03:27:02	1.2
  @@ -56,7 +56,7 @@
   # ========================================================================= #
   
   # @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  -# @version $Id: Makefile.win,v 1.1 2001/08/11 02:06:14 pier Exp $
  +# @version $Id: Makefile.win,v 1.2 2001/08/11 03:27:02 pier Exp $
   
   # All our object files
   OBJS =   wa_config.obj \
  @@ -70,6 +70,7 @@
   
   # Files created by this script (for removal only)
   GENS =   webapp.idb \
  +         webapp.pdb \
            pr_warp_defs.h
   
   # The target library
  @@ -82,12 +83,12 @@
   # Flags for the C compiler
   CFLAGS = /nologo \
            /W3 \
  -!IF "$(DEBUG)" == "TRUE"
  +!IF "$(DEBUG)" == "true"
            /MDd \
            /GX \
            /Zi \
            /Od \
  -         /Yd
  +         /Yd \
            /D"DEBUG" \
   !ELSE
   	     /MD \
  
  
  

Mime
View raw message