mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-02 22:37:50 +00:00
Fix idl->.h and idl->.xpt rules to not depend on $(XPIDL_GEN_DIR) because (on linux at least) _any_ addition to that directory resets the timestamp, causing all .h files to rebuild.
One such .h file is nsISupports.h, which we'd prefer _not_ to rebuild. Instead, added a test for $(XPIDL_GEN_DIR) in the .h and .xpt rules.
This commit is contained in:
parent
48ce127df1
commit
6a3ec157b7
@ -942,10 +942,11 @@ export:: $(XPIDLSRCS) $(XPDIST)/idl
|
||||
|
||||
# generate .h files from into $(XPIDL_GEN_DIR), then export to $(XPDIST)/include;
|
||||
# warn against overriding existing .h file.
|
||||
$(XPIDL_GEN_DIR):
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
|
||||
|
||||
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)
|
||||
# don't depend on $(XPIDL_GEN_DIR), because the modification date changes
|
||||
# with any addition to the directory, regenerating all .h files -> everything.
|
||||
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE)
|
||||
@if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR); rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); else true; fi
|
||||
$(XPIDL_COMPILE) -m header -w -I $(XPDIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
|
||||
@if test -n "$(findstring $*.h, $(EXPORTS))"; \
|
||||
then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
|
||||
@ -956,7 +957,8 @@ export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(XPDIST)/include
|
||||
ifndef NO_GEN_XPT
|
||||
# generate intermediate .xpt files into $(XPIDL_GEN_DIR), then link
|
||||
# into $(XPIDL_MODULE).xpt and export it to $(DIST)/bin/components.
|
||||
$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)
|
||||
$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE)
|
||||
@if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR); rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); else true; fi
|
||||
$(XPIDL_COMPILE) -m typelib -w -I $(XPDIST)/idl -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
|
||||
|
||||
$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
|
||||
|
Loading…
x
Reference in New Issue
Block a user