You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/12/08 20:03:49 UTC
cvs commit: httpd-2.0 Apache.dsw Makefile.win
wrowe 00/12/08 11:03:49
Modified: . Apache.dsw Makefile.win
Log:
Now that sdbm and installer are gone, clean up the win32 build.
Revision Changes Path
1.36 +0 -30 httpd-2.0/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Apache.dsw 2000/12/07 21:37:42 1.35
+++ Apache.dsw 2000/12/08 19:03:48 1.36
@@ -348,24 +348,6 @@
###############################################################################
-Project: "install"=".\os\win32\installer\installdll\install.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name aprlib
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name aprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
Package=<5>
@@ -742,18 +724,6 @@
###############################################################################
Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "sdbmlib"=".\srclib\sdbm\sdbmlib.dsp" - Package Owner=<4>
Package=<5>
{{{
1.33 +1 -11 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.win 2000/12/07 21:37:42 1.32
+++ Makefile.win 2000/12/08 19:03:48 1.33
@@ -8,7 +8,6 @@
# clean - remove (most) generated files
# _cleanr - remove (most) files generated by a Release build
# _cleand - remove (most) files generated by a Debug build
-# installdll - build the InstallShield helper dll (Release only)
#
# The default installation directory is \Apache. This can be changed
# with the INSTDIR macro, for example:
@@ -56,11 +55,7 @@
clean:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _installdll
-installdll:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _installdll
-
_build:
echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
cd srclib\apr
@@ -141,7 +136,7 @@
copy Apache$(SHORT)\Apache.exe $(INSTDIR)
copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
copy srclib\apr\$(LONG)\aprlib.dll $(INSTDIR)
- copy srclib\apr-util\$(LONG)\aprutil.dll $(INSTDIR)
+ copy srclib\apr-util\$(LONG)\apr-util.dll $(INSTDIR)
copy srclib\expat-lite\expatlib$(SHORT)\expatlib.dll $(INSTDIR)
copy modules\aaa\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules
copy modules\aaa\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
@@ -163,8 +158,3 @@
copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin
copy support\$(LONG)\logresolve.exe $(INSTDIR)\bin
copy support\$(LONG)\rotatelogs.exe $(INSTDIR)\bin
-
-_installdll:
- cd os\win32\installer\installdll
- $(MAKE) $(MAKEOPT) -f install.mak CFG="install - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..\..