Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pull libpref on the XPCOM branch

Browse Source 
git-svn-id: svn://10.0.0.236/branches/NGLAYOUT_INTEGRATION_BRANCH@5998 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hardts%netscape.com
1998-07-20 21:41:16 +00:00
parent 6b623ca64a
commit e31000dc2e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/client.mak
View File

@@ -81,8 +81,8 @@ clobber_build_all:: clobber_all \
!if defined(MOZ_NGLAYOUT)
# The MOZ_NGLAYOUT pull is complicated, be very careful choosing which files are on
# the tip and which are on the branches.
pull_all:: pull_client_source_product pull_nglayout pull_netlib repull_ngl_integration pull_imglib repull_include
# the tip and which are on the branches. The order of the pulls matters.
pull_all:: pull_client_source_product pull_nglayout pull_netlib repull_ngl_integration pull_imglib repull_tip
!else
pull_all:: pull_client_source_product
!endif
@@ -111,10 +111,12 @@ pull_imglib:
@cd $(MOZ_SRC)/$(MOZ_TOP)
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) pull_imglib $(NGLAYOUT_ENV_VARS)
# Want certain files in the include directory to be on the tip
repull_include:
# Want certain files to be on the tip
# libpref should be on the tip, missed a few files landing XPCOM_BRANCH.
repull_tip:
@cd $(MOZ_SRC)
$(CVSCO) -A $(MOZ_TOP)/include/net.h
$(CVSCO) -r XPCOM_BRANCH $(MOZ_TOP)/modules/libpref
!endif