Changes to allow hack in necko makefiles so that header names don't collide.

This commit is contained in:
warren%netscape.com 1999-06-12 04:30:44 +00:00
Родитель 09e841b60c
Коммит 2ec7fb512d
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -99,7 +99,7 @@ LCFLAGS=$(LCFLAGS) -DSMOOTH_PROGRESS
!endif
XPDIST=$(DEPTH)\dist
PUBLIC=$(XPDIST)\public
PUBLIC=$(XPDIST)\include
#//-----------------------------------------------------------------------
#// OBJDIR is NOT the same as DIST for Win16. The Win16 dist stuff can
@ -154,7 +154,7 @@ NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
CFGFILE=$(OBJDIR)\cmd.cfg
INCS=$(INCS) -I$(XPDIST)\include -I$(DIST)\include -I$(DEPTH)\include
INCS=$(INCS) -I$(PUBLIC) -I$(DIST)\include -I$(DEPTH)\include
# Perhaps we should add MOZ_LITENESS_FLAGS to 16 bit build
!if "$(MOZ_BITS)" == "16"

Просмотреть файл

@ -229,7 +229,7 @@ $(JAVA_DESTPATH)\$(PACKAGE): $(JAVA_DESTPATH)
$(JMCSRCDIR):
-mkdir $(JMCSRCDIR)
$(XPDIST)\include:
$(PUBLIC):
-mkdir $(XPDIST:/=\)\include
!ifdef IDL_GEN
@ -606,7 +606,7 @@ export:: $(JMC_STUBS) $(OBJDIR) $(JMC_OBJS)
#//
#//------------------------------------------------------------------------
!if "$(EXPORTS)" != "$(NULL)"
export:: $(XPDIST)\include
export:: $(PUBLIC)
for %f in ($(EXPORTS)) do $(MAKE_INSTALL:/=\) %f $(XPDIST:/=\)\include
clobber::
@ -700,10 +700,10 @@ export:: $(XPDIST)\idl
@echo.
-for %i in ($(XPIDLSRCS:/=\)) do $(MAKE_INSTALL) %i $(XPDIST)\idl
export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(XPDIST)\include
export:: $(XPIDL_GEN_DIR) $(XPIDL_HEADERS) $(PUBLIC)
@echo +++ make: exporting generated XPIDL header files
@echo.
-for %i in ($(XPIDL_HEADERS:/=\)) do $(MAKE_INSTALL) %i $(XPDIST)\include
-for %i in ($(XPIDL_HEADERS:/=\)) do $(MAKE_INSTALL) %i $(PUBLIC)
!ifndef NO_GEN_XPT
install:: $(XPIDL_GEN_DIR) $(TYPELIB)