зеркало из https://github.com/mozilla/pjs.git
Bug 398730 - Remove default suffix rules from rules.mk and some fixes to help automated-rewriting efforts, r=luser a=sayrer
This commit is contained in:
Родитель
f182e2dac7
Коммит
dbe5823427
|
@ -307,6 +307,8 @@ endif
|
||||||
|
|
||||||
ALL_TRASH = \
|
ALL_TRASH = \
|
||||||
$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
|
$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
|
||||||
|
$(OBJS:.$(OBJ_SUFFIX)=.s) $(OBJS:.$(OBJ_SUFFIX)=.ii) \
|
||||||
|
$(OBJS:.$(OBJ_SUFFIX)=.i) \
|
||||||
$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
|
$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
|
||||||
$(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \
|
$(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \
|
||||||
$(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \
|
$(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \
|
||||||
|
@ -1214,6 +1216,7 @@ host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
|
||||||
moc_%.cpp: %.h Makefile Makefile.in
|
moc_%.cpp: %.h Makefile Makefile.in
|
||||||
$(MOC) $< $(OUTOPTION)$@
|
$(MOC) $< $(OUTOPTION)$@
|
||||||
|
|
||||||
|
ifdef ASFILES
|
||||||
# The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
|
# The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
|
||||||
# a '-c' flag.
|
# a '-c' flag.
|
||||||
%.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) Makefile Makefile.in
|
%.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) Makefile Makefile.in
|
||||||
|
@ -1222,6 +1225,7 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||||
else
|
else
|
||||||
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
|
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
%.$(OBJ_SUFFIX): %.S Makefile Makefile.in
|
%.$(OBJ_SUFFIX): %.S Makefile Makefile.in
|
||||||
$(AS) -o $@ $(ASFLAGS) -c $<
|
$(AS) -o $@ $(ASFLAGS) -c $<
|
||||||
|
@ -2014,7 +2018,6 @@ endif
|
||||||
# hundreds of built-in suffix rules for stuff we don't need.
|
# hundreds of built-in suffix rules for stuff we don't need.
|
||||||
#
|
#
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .out .a .ln .o .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .pp .mk .in .$(OBJ_SUFFIX) .m .mm .idl $(BIN_SUFFIX)
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Fake targets. Always run these rules, even if a file/directory with that
|
# Fake targets. Always run these rules, even if a file/directory with that
|
||||||
|
|
Загрузка…
Ссылка в новой задаче