[Scummvm-cvs-logs] CVS: scummvm Makefile,1.39,1.40 Makefile.common,1.2,1.3 Makefile.irix,1.2,1.3 Makefile.macosx,1.2,1.3 Makefile.mingw,1.16,1.17 Makefile.x11,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv14473

Modified Files:
	Makefile Makefile.common Makefile.irix Makefile.macosx 
	Makefile.mingw Makefile.x11 
Log Message:
Makefile.mingw now uses Makefile.common, too

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Makefile	26 Apr 2002 13:39:31 -0000	1.39
--- Makefile	27 Apr 2002 11:06:27 -0000	1.40
***************
*** 14,15 ****
--- 14,19 ----
  
  include Makefile.common
+ 
+ dist:
+ 	rm -f $(ZIPFILE)
+ 	zip -q $(ZIPFILE) $(DISTFILES)

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.common	27 Apr 2002 09:56:48 -0000	1.2
--- Makefile.common	27 Apr 2002 11:06:27 -0000	1.3
***************
*** 30,37 ****
  	rm -f $(OBJS) scummvm$(EXEEXT)
  
- dist:
- 	rm -f $(ZIPFILE)
- 	zip -q $(ZIPFILE) $(DISTFILES)
- 
  $(OBJS): $(INCS)
  
--- 30,33 ----

Index: Makefile.irix
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.irix,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.irix	26 Apr 2002 13:39:31 -0000	1.2
--- Makefile.irix	27 Apr 2002 11:06:27 -0000	1.3
***************
*** 16,17 ****
--- 16,21 ----
  
  include Makefile.common
+ 
+ dist:
+ 	rm -f $(ZIPFILE)
+ 	zip -q $(ZIPFILE) $(DISTFILES)

Index: Makefile.macosx
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.macosx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.macosx	27 Apr 2002 09:57:34 -0000	1.2
--- Makefile.macosx	27 Apr 2002 11:06:27 -0000	1.3
***************
*** 14,15 ****
--- 14,19 ----
  
  include Makefile.common
+ 
+ dist:
+ 	rm -f $(ZIPFILE)
+ 	zip -q $(ZIPFILE) $(DISTFILES)

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.mingw,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.mingw	17 Apr 2002 20:49:57 -0000	1.16
--- Makefile.mingw	27 Apr 2002 11:06:27 -0000	1.17
***************
*** 2,6 ****
  SCUMMVMPATH=C:/scummvm
  SRC=.
! VPATH=$(SRC):$(SRC)/sound:$(SRC)/simon:$(SRC)/v3:$(SRC)/v4
  
  ### Modify these paths
--- 2,6 ----
  SCUMMVMPATH=C:/scummvm
  SRC=.
! VPATH=$(SRC)
  
  ### Modify these paths
***************
*** 16,43 ****
  CPPFLAGS= $(DEFINES) $(INCLUDES)
  LIBS	= -lmingw32 -lwinmm -lwsock32 -lmad $(SDL_LIBS)
! EXEC=scummvm.exe
! 
! OBJS	= actor.o boxes.o costume.o gfx.o object.o resource.o \
! 	saveload.o script.o scummvm.o sound.o string.o \
! 	sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
! 	imuse.o fmopl.o mixer.o debugrl.o \
! 	akos.o vars.o insane.o gameDetector.o init.o \
! 	resource_v3.o resource_v4.o 2xsai.o main.o \
! 	midi.o simon.o simonsys.o mididrv.o
! 
! .cpp.o:
! 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
  
! all: $(EXEC)
  
! $(EXEC): $(OBJS)
! 	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
  
- clean:
- 	rm -f $(OBJS) $(EXEC)
  
! install:   $(EXEC)
  	mkdir -p $(SCUMMVMPATH)
! 	strip $(EXEC) -o $(SCUMMVMPATH)/$(EXEC)
  
  dist:   install
--- 16,30 ----
  CPPFLAGS= $(DEFINES) $(INCLUDES)
  LIBS	= -lmingw32 -lwinmm -lwsock32 -lmad $(SDL_LIBS)
! EXEEXT	:=.exe
  
! OBJS	= sdl.o
  
! include Makefile.common
  
  
! # Some additional targets
! install:   scummvm$(EXEEXT)
  	mkdir -p $(SCUMMVMPATH)
! 	strip scummvm$(EXEEXT) -o $(SCUMMVMPATH)/scummvm$(EXEEXT)
  
  dist:   install
***************
*** 48,49 ****
--- 35,38 ----
  	cp SDL/lib/SDL.dll $(SCUMMVMPATH)
  	u2d $(SCUMMVMPATH)/*.txt
+ 
+ .PHONY: install dist

Index: Makefile.x11
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.x11,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.x11	26 Apr 2002 16:10:11 -0000	1.3
--- Makefile.x11	27 Apr 2002 11:06:27 -0000	1.4
***************
*** 14,15 ****
--- 14,19 ----
  
  include Makefile.common
+ 
+ dist:
+ 	rm -f $(ZIPFILE)
+ 	zip -q $(ZIPFILE) $(DISTFILES)