Commit 7733357d authored by seawood%netscape.com's avatar seawood%netscape.com
Browse files

Rename 'install' build phase to 'libs'. 

Bug #56601 r=pavlov
parent 28ba5f23

accessible/src/makefile.win

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ LINCS= \ 


include <$(DEPTH)\config\rules.mak>



install:: $(LIBRARY)

libs:: $(LIBRARY)

        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib



clobber::

client.mak

+4 −4
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ clobber_all: clobber_nspr clobber_psm clobber_seamonkey 


build_all: build_nspr build_seamonkey



build_all_dep: depend install

build_all_dep: depend libs



distclean: 

	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
@@ -370,7 +370,7 @@ build_xpconnect: build_nspr 
	@cd $(MOZ_SRC)\$(MOZ_TOP)\string

	nmake -f makefile.win all

	@cd $(MOZ_SRC)\$(MOZ_TOP)\xpcom

	nmake -f makefile.win install

	nmake -f makefile.win libs

	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src

	nmake -f makefile.win all

	@cd $(MOZ_SRC)\$(MOZ_TOP)\js\src\xpconnect
@@ -392,9 +392,9 @@ build_dist: 
	@cd $(MOZ_SRC)\mozilla\.

	nmake -f makefile.win all



install:

libs:

	@cd $(MOZ_SRC)\$(MOZ_TOP)\.

	nmake -f makefile.win install

	nmake -f makefile.win libs



export: build_nspr

	@cd $(MOZ_SRC)\$(MOZ_TOP)\.

config/rules.mak

+12 −15
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ W32LOBJS = $(OBJS: .= +-.) 


all::

    $(NMAKE) -f makefile.win export

    $(NMAKE) -f makefile.win install

    $(NMAKE) -f makefile.win libs



#//------------------------------------------------------------------------

#//
@@ -430,7 +430,7 @@ export:: 


!endif # defined(META_COMPONENT)



install:: $(LIBRARY)

libs:: $(LIBRARY)

        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib



clobber::
@@ -442,7 +442,7 @@ clobber:: 
# library, because it's a component; nobody should be linking against

# it!



install:: $(DLL)

libs:: $(DLL)

        $(MAKE_INSTALL) $(DLL) $(DIST)\bin\components



clobber::
@@ -478,7 +478,7 @@ export:: 


!endif # defined(META_COMPONENT)



install:: $(LIBRARY)

libs:: $(LIBRARY)

        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib



clobber::
@@ -489,7 +489,7 @@ clobber:: 
# Build the library as a standalone DLL. We _will_ install the import

# library in this case, because people may link against it.



install:: $(DLL) $(OBJDIR)\$(LIBRARY_NAME).lib

libs:: $(DLL) $(OBJDIR)\$(LIBRARY_NAME).lib

        $(MAKE_INSTALL) $(DLL) $(DIST)\bin

        $(MAKE_INSTALL) $(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
@@ -508,7 +508,7 @@ clobber:: 
#//------------------------------------------------------------------------

!if defined(LIBRARY)



install:: $(LIBRARY)

libs:: $(LIBRARY)

        $(MAKE_INSTALL) $(LIBRARY) $(DIST)/lib



clobber::
@@ -556,9 +556,9 @@ export:: 
    @$(W95MAKE) export $(MAKEDIR) $(DIRS)

!endif # DIRS



install::

libs::

!ifdef DIRS

    @$(W95MAKE) install $(MAKEDIR) $(DIRS)

    @$(W95MAKE) libs $(MAKEDIR) $(DIRS)

!endif # DIRS



depend::
@@ -596,7 +596,7 @@ export:: 
libs:: 

	@set MAKE_ARGS=$@



install:: 

libs:: 

	@set MAKE_ARGS=$@



mangle::
@@ -647,10 +647,7 @@ $(OBJS) 


export:: $(DIRS)



libs:: 

    @echo The libs build phase is obsolete.



install:: $(DIRS)

libs:: $(DIRS)



depend:: $(DIRS)
@@ -821,7 +818,7 @@ export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(PUBLIC) 
	$(PERL) -I$(DEPTH)\config $(DEPTH)\config\build-list.pl $(PUBLIC)/.headerlist $(XPIDL_HEADERS)



!ifndef NO_GEN_XPT

install:: $(XPIDL_GEN_DIR) $(TYPELIB)

libs:: $(XPIDL_GEN_DIR) $(TYPELIB)

        @echo +++ make: installing typelib '$(TYPELIB)' to components directory

        $(MAKE_INSTALL) $(TYPELIB) $(DIST)\bin\components

!endif
@@ -873,7 +870,7 @@ JAR_MANIFEST = jar.mn 


chrome::



install:: chrome

libs:: chrome



!ifdef MOZ_CHROME_FILE_FORMAT

_CHROME_FILE_FORMAT=$(MOZ_CHROME_FILE_FORMAT)

content/base/src/makefile.win

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ LCFLAGS = \ 


include <$(DEPTH)\config\rules.mak>



install:: $(LIBRARY)

libs:: $(LIBRARY)

	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib



clobber::

content/events/src/makefile.win

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ LCFLAGS = \ 


include <$(DEPTH)\config\rules.mak>



install:: $(LIBRARY)

libs:: $(LIBRARY)

	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib



clobber::