Ticket #8021: make.diff

File make.diff, 2.4 KB (added by SF/xtrochu, 19 years ago)
  • Makefile

    ? make.diff
    RCS file: /cvsroot/scummvm/scummvm-new/Makefile,v
    retrieving revision 1.4
    diff -u -r1.4 Makefile
     
    11# $Header: /cvsroot/scummvm/scummvm-new/Makefile,v 1.4 2002/08/21 17:42:59 fingolfin Exp $
    22
    33CXX      = c++
     4AR        = ar cru
     5RANLIB = ranlib
     6RM      = rm -f
     7MKDIR = mkdir -p
     8ECHO  = echo -n
     9CAT    = cat
     10RM      = rm -f
     11# recursive version of RM
     12RM_REC = $(RM) -r
     13ZIP = zip -q
     14CP  = cp
     15
    416CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
    517DEFINES  =
    618LDFLAGS :=
     
    2941include Makefile.common
    3042
    3143dist:
    32         rm -f $(ZIPFILE)
    33         zip -q $(ZIPFILE) $(DISTFILES)
     44        $(RM) $(ZIPFILE)
     45        $(ZIP) $(ZIPFILE) $(DISTFILES)
    3446
    3547# Until we add a nice configure tool, default to the SDL build rules
    3648build.rules:
    37         cp backends/sdl/build.rules build.rules
     49        $(CP) backends/sdl/build.rules build.rules
  • Makefile.common

    RCS file: /cvsroot/scummvm/scummvm-new/Makefile.common,v
    retrieving revision 1.6
    diff -u -r1.6 Makefile.common
     
    3939        $(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
    4040
    4141scumm/libscumm.a: $(SCUMM_OBJS)
    42         ar cru $@ $+
    43         ranlib $@
     42        $(AR) $@ $+
     43        $(RANLIB) $@
    4444
    4545simon/libsimon.a: $(SIMON_OBJS)
    46         ar cru $@ $+
    47         ranlib $@
     46        $(AR) $@ $+
     47        $(RANLIB) $@
    4848
    4949clean:
    50         rm -f $(OBJS) $(SCUMM_OBJS) $(SIMON_OBJS) scummvm$(EXEEXT)
     50        $(RM) $(OBJS) $(SCUMM_OBJS) $(SIMON_OBJS) scummvm$(EXEEXT)
    5151
    5252.PHONY: all clean dist distclean
    5353
     
    6464DEPFILES = $(wildcard $(patsubst %,%/$(DEPDIR)/*.d,$(MODULES)))
    6565
    6666.cpp.o:
    67         mkdir -p $(*D)/$(DEPDIR)
     67        $(MKDIR) $(*D)/$(DEPDIR)
    6868        $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
    69         echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
    70         cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
    71         rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
     69        $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
     70        $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
     71        $(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
    7272
    7373-include $(DEPFILES) /dev/null
    7474
    7575distclean: clean
    76         rm -rf $(DEPDIRS)
     76        $(RM_REC) $(DEPDIRS)