Bug 271929 - Remove purge-old-headers.pl logic and simple rm -rf dist/include at the start of the build process. Patch by Hans-Andreas Engel <Hans-A.Engel@unibas.ch> r=me

This commit is contained in:
bsmedberg%covad.net 2005-03-16 18:21:16 +00:00
Родитель 179549144b
Коммит 75c788b6ad
4 изменённых файлов: 1 добавлений и 10 удалений

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

@ -52,6 +52,7 @@ ifeq ($(BUILD_MODULES),all)
#
default: $(SUBMAKEFILES)
$(RM) -rf $(DIST)/sdk
$(RM) -rf $(DIST)/include
$(MAKE) -C config export
$(MAKE) nspr
$(MAKE) ldap
@ -485,7 +486,6 @@ tier_50:
$(UPDATE_TITLE) \
$(MAKE) -C $$d export; \
done ; \
$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include ;\
for d in $(tier_50_dirs); do \
$(UPDATE_TITLE) \
$(MAKE) -C $$d libs; \
@ -504,7 +504,6 @@ tier_%:
for d in $($@_dirs); do $(UPDATE_TITLE) \
$(MAKE) -C $$d export; \
done ; \
$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include ;\
for d in $($@_dirs); do $(UPDATE_TITLE) \
$(MAKE) -C $$d libs; \
done
@ -546,9 +545,6 @@ endif # OS_ARCH == DARWIN
endif # BUILD_STATIC_LIBS
endif # MOZ_TREE_CAIRO
export::
@$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include
distclean::
cat unallmakefiles | $(XARGS) rm -f
rm -f unallmakefiles $(DIST_GARBAGE)

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

@ -104,7 +104,6 @@ HEADERS = nsBuildID.h $(DEPTH)/mozilla-config.h
export:: $(TARGETS) $(HEADERS)
$(INSTALL) $(IFLAGS1) $(HEADERS) $(DIST)/include
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(HEADERS)
-rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
-rm -f $(DIST)/bin/chrome/chromelist.txt
$(NSINSTALL) -t $(IFLAGS1) $(HEADERS) $(DIST)/sdk/include

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

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

@ -1261,7 +1261,6 @@ ifneq ($(EXPORTS),)
ifndef NO_DIST_INSTALL
export:: $(EXPORTS) $(PUBLIC)
$(INSTALL) $(IFLAGS1) $^
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(PUBLIC),$^))
endif # NO_DIST_INSTALL
endif
@ -1271,7 +1270,6 @@ export:: $(PUBLIC) $(SDK_PUBLIC)
export:: $(SDK_HEADERS)
$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $^)
$(INSTALL) $(IFLAGS1) $^ $(SDK_PUBLIC)
endif # NO_DIST_INSTALL
endif
@ -1428,7 +1426,6 @@ endif
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
ifndef NO_DIST_INSTALL
$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $^)
endif # NO_DIST_INSTALL
@ -1483,7 +1480,6 @@ endif # NO_DIST_INSTALL
export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS))
ifndef NO_DIST_INSTALL
$(INSTALL) $(IFLAGS1) $^ $(PUBLIC)
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $^)
$(INSTALL) $(IFLAGS1) $^ $(SDK_PUBLIC)
endif