Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/ensemblist/files: ensemblist-040126-build.patch
Date: Fri, 23 Jan 2009 08:32:22
Message-Id: E1LQHSd-00010l-HO@stork.gentoo.org
1 mr_bones_ 09/01/23 08:32:19
2
3 Added: ensemblist-040126-build.patch
4 Log:
5 EAPI=2; add use-based dep; fixup build process a bit
6 (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)
7
8 Revision Changes Path
9 1.1 games-puzzle/ensemblist/files/ensemblist-040126-build.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/ensemblist/files/ensemblist-040126-build.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/ensemblist/files/ensemblist-040126-build.patch?rev=1.1&content-type=text/plain
13
14 Index: ensemblist-040126-build.patch
15 ===================================================================
16 diff -ru ensemblist-040126.orig/Makefile ensemblist-040126/Makefile
17 --- ensemblist-040126.orig/Makefile 2004-01-26 10:37:05.000000000 -0500
18 +++ ensemblist-040126/Makefile 2009-01-23 03:24:05.000000000 -0500
19 @@ -1,17 +1,8 @@
20 NAME=ensemblist
21 -CC=gcc
22 -ifdef DEBUG
23 -DATADIR=/home/rixed/src/ensemblist/datas
24 -COMPILE_FLAGS=-Wall -fno-builtin -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wredundant-decls -O0 -g `libmikmod-config --cflags` -DDATADIR=$(DATADIR)
25 -LINK_FLAGS=-g -lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lefence -lpthread
26 -else
27 DATADIR=$(DESTDIR)/usr/share/$(NAME)
28 -COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR)
29 -LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread
30 -endif
31 +COMPILE_FLAGS=`libmikmod-config --cflags` -DDATADIR=$(DATADIR)
32 +LINK_FLAGS=-L/usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread -lm
33 APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL
34 -#uncomment the following if you want to compile on MacOS/X
35 -#LINK_FLAGS=$(LINK_FLAGS) $(APPLE_FRAMEWORKS)
36 CFILES=$(wildcard *.c)
37 OFILES=$(patsubst %.c,%.o,$(CFILES))
38
39 @@ -22,15 +13,10 @@
40 all: $(NAME)
41
42 $(NAME): $(OFILES)
43 - @echo '$(COL)$@$(NORM)'
44 - $(CC) $(COMPILE_FLAGS) $(LINK_FLAGS) $^ -o $@
45 -ifndef DEBUG
46 - strip $(NAME)
47 -endif
48 + $(CC) $(CFLAGSLD) $(COMPILE_FLAGS) $^ -o $@ $(LINK_FLAGS)
49
50 .c.o:
51 - @echo '$(COL)$@$(NORM)'
52 - $(CC) $(COMPILE_FLAGS) -c $<
53 + $(CC) $(CFLAGS) $(COMPILE_FLAGS) -c $<
54
55 clean:
56 @echo '$(COL)$@$(NORM)'