Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changes to allow hack in necko makefiles so that header names don�t collide. Keeping up with config.mak and rules.mak

Browse Source
This commit is contained in:
andreas.otte%primus-online.de 1999-06-23 20:38:09 +00:00
parent dc1b807aea
commit 921ce6c709
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.mk
View File

@ -342,7 +342,7 @@ endif
# be put in the library directories where it belongs so that it can
# get exported to dist properly.
#
INCLUDES = $(LOCAL_INCLUDES) -I$(DIST)/include -I$(XPDIST)/include -I$(topsrcdir)/include $(OS_INCLUDES) $(G++INCLUDES)
INCLUDES = $(LOCAL_INCLUDES) -I$(PUBLIC) -I$(DIST)/include -I$(XPDIST)/include -I$(topsrcdir)/include $(OS_INCLUDES) $(G++INCLUDES)
LIBNT = $(DIST)/lib/libnt.$(LIB_SUFFIX)
LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX)
@ -427,7 +427,7 @@ endif
LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
# all public include files go in subdirectories of PUBLIC:
PUBLIC = $(XPDIST)/public
PUBLIC = $(XPDIST)/include
ifdef USE_AUTOCONF
DEPENDENCIES = .md

10
config/rules.mk
View File

@ -898,13 +898,13 @@ endif # JAVA_OR_NSJVM
endif
################################################################################
# Copy each element of EXPORTS to $(XPDIST)/include
# Copy each element of EXPORTS to $(PUBLIC)
ifneq ($(EXPORTS),)
$(XPDIST)/include::
$(PUBLIC)::
@if test ! -d $@; then echo Creating $@; rm -rf $@; $(NSINSTALL) -D $@; else true; fi
export:: $(EXPORTS) $(XPDIST)/include
export:: $(EXPORTS) $(PUBLIC)
$(INSTALL) -m 444 $^
endif
@ -945,7 +945,7 @@ $(XPDIST)/idl::
export:: $(XPIDLSRCS) $(XPDIST)/idl
$(INSTALL) -m 444 $^
# generate .h files from into $(XPIDL_GEN_DIR), then export to $(XPDIST)/include;
# generate .h files from into $(XPIDL_GEN_DIR), then export to $(PUBLIC);
# warn against overriding existing .h file. (Added to MAKE_DIRS above.)
$(XPIDL_GEN_DIR):
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
@ -958,7 +958,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE)
@if test -n "$(findstring $*.h, $(EXPORTS))"; \
then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(XPDIST)/include
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(PUBLIC)
$(INSTALL) -m 444 $^
ifndef NO_GEN_XPT