Commit 0c3d58a3 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Now that sdbm and installer are gone, clean up the win32 build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87266 13f79535-47bb-0310-9956-ffa450edef68
parent 32f7872f

Apache.dsw

+0 −30
Original line number Diff line number Diff line
@@ -348,24 +348,6 @@ Package=<4> 


###############################################################################



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>
@@ -753,18 +735,6 @@ Package=<4> 


###############################################################################



Project: "sdbmlib"=".\srclib\sdbm\sdbmlib.dsp" - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

}}}



###############################################################################



Global:



Package=<5>

Makefile.win

+1 −11
Original line number Diff line number Diff line
@@ -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,10 +55,6 @@ _cleand: 
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)
@@ -141,7 +136,7 @@ _install: 
	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 @@ _install: 
	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 ..\..\..