Sat Apr 13 19:06:14 2013 UTC ()
Reduce pkglint.


(dholland)
diff -r1.3 -r1.4 pkgsrc/emulators/Cygne-SDL/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/emulators/Cygne-SDL/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/Cygne-SDL/patches/patch-aa 2005/11/03 21:38:04 1.3
+++ pkgsrc/emulators/Cygne-SDL/patches/patch-aa 2013/04/13 19:06:13 1.4
@@ -1,46 +1,51 @@ @@ -1,46 +1,51 @@
1$NetBSD: patch-aa,v 1.3 2005/11/03 21:38:04 rillig Exp $ 1$NetBSD: patch-aa,v 1.4 2013/04/13 19:06:13 dholland Exp $
2 2
3--- src/Makefiles/Makefile.unix.orig 2002-03-26 17:50:55.000000000 +0100 3- configure for pkgsrc
 4- avoid unnecessary gmake syntax
 5
 6--- src/Makefiles/Makefile.unix.orig 2002-03-26 16:50:55.000000000 +0000
4+++ src/Makefiles/Makefile.unix 7+++ src/Makefiles/Makefile.unix
5@@ -1,5 +1,4 @@ 8@@ -1,24 +1,15 @@
6-CC = gcc 9-CC = gcc
7-LD = gcc  10-LD = gcc
8+#LD = g++ 11+#LD = g++
9 NASM = nasm 12 NASM = nasm
10  13
11 ### Include and lib stuff #### 14 ### Include and lib stuff ####
12@@ -8,17 +7,13 @@ STDLIB = /usr/lib  15-STDINCLUDE = /usr/include
13 SDLINCLUDE = /usr/local/include/SDL 16-STDLIB = /usr/lib
14 SDLLIB = /usr/local/lib 17-SDLINCLUDE = /usr/local/include/SDL
15  18-SDLLIB = /usr/local/lib
 19-
16-CFLAGS = -O1 -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__ -fomit-frame-pointer -march=pentium \ 20-CFLAGS = -O1 -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__ -fomit-frame-pointer -march=pentium \
17- -mpentium -finline-functions -fexpensive-optimizations -funroll-loops -funroll-all-loops -pipe \ 21- -mpentium -finline-functions -fexpensive-optimizations -funroll-loops -funroll-all-loops -pipe \
18- -fschedule-insns2 -fstrength-reduce -malign-double -mfancy-math-387 -ffast-math -fforce-addr \ 22- -fschedule-insns2 -fstrength-reduce -malign-double -mfancy-math-387 -ffast-math -fforce-addr \
19- -fforce-mem `sdl-config --cflags` \ 23- -fforce-mem `sdl-config --cflags` \
20- -L$(STDLIB) -L$(SDLLIB) -I$(STDINCLUDE) -I$(SDLINCLUDE) 24- -L$(STDLIB) -L$(SDLLIB) -I$(STDINCLUDE) -I$(SDLINCLUDE)
21+CFLAGS += -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__ 
22  25
23-LDFLAGS = $(CFLAGS) 26-LDFLAGS = $(CFLAGS)
 27+CFLAGS += -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__
 28+
24+LDFLAGS += `sdl-config --libs` 29+LDFLAGS += `sdl-config --libs`
25  30
26 TARGET = cygne 31 TARGET = cygne
27  32
28-OBJ = ddrawsdl.o filessdl.o gfx.o nec.o tcache.o memory.o mainsdl.o zlib/unzip.o 33-OBJ = ddrawsdl.o filessdl.o gfx.o nec.o tcache.o memory.o mainsdl.o zlib/unzip.o
29+OBJ = ddrawsdl.o filessdl.o gfx.o nec.o tcache.o memory.o mainsdl.o unzip.o 34+OBJ = ddrawsdl.o filessdl.o gfx.o nec.o tcache.o memory.o mainsdl.o unzip.o
30  35
31 LIBS = `sdl-config --libs` -lz 36 LIBS = `sdl-config --libs` -lz
32  37
33@@ -28,17 +23,22 @@ INCS = -I. `sdl-config --cflags` 38@@ -28,17 +19,22 @@ INCS = -I. `sdl-config --cflags`
34  39
35 THECC = $(CC) $(CFLAGS) $(INCS) 40 THECC = $(CC) $(CFLAGS) $(INCS)
36  41
37-%.o: %.asm 42-%.o: %.asm
38+.SUFFIXES: .asm 43+.SUFFIXES: .asm
39+ 44+
40+.asm.o: 45+.asm.o:
41 $(NASM) -f elf -o $@ $< 46 $(NASM) -f elf -o $@ $<
42  47
43-%.o: %.c 48-%.o: %.c
44- $(THECC) -c $< -o $@ 49- $(THECC) -c $< -o $@
45+.c.o: 50+.c.o:
46+ $(CC) $(CFLAGS) $(INCS) -c $< -o $@ 51+ $(CC) $(CFLAGS) $(INCS) -c $< -o $@