]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / gpe-mixer / gpe-mixer-0.32 / fix_makefile.patch
1 diff -urNd ../gpe-mixer-0.32-r0/gpe-mixer-0.32/Makefile gpe-mixer-0.32/Makefile
2 --- ../gpe-mixer-0.32-r0/gpe-mixer-0.32/Makefile        2004-08-03 03:31:33.000000000 +0100
3 +++ gpe-mixer-0.32/Makefile     2004-08-03 13:00:42.000000000 +0100
4 @@ -1,6 +1,6 @@
5  PREFIX = /usr
6  PACKAGE = gpe-mixer
7 -DEBUG = yes
8 +DEBUG = no
9  CVSBUILD = no
10  GST = yes
11  VERSION = 0.32
12 @@ -8,26 +8,26 @@
13  MEMBERS = gpe-mixer
14  
15  GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
16 -GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama
17 +GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
18  
19 -CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
20 +PACKAGE_CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
21  ifeq ($(DEBUG),yes)
22 -CFLAGS += -O2 -g
23 -LDFLAGS = -g #-lefence
24 +PACKAGE_CFLAGS += -O2 -g
25 +PACKAGE_LDFLAGS = -g #-lefence
26  else
27 -CFLAGS += -Os -fomit-frame-pointer
28 +PACKAGE_CFLAGS += -Os -fomit-frame-pointer
29  endif
30 -CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
31 +PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
32  
33  ifeq ($(CVSBUILD),yes)
34 -CFLAGS += -I../libgpewidget
35 -LDFLAGS += -L../libgpewidget
36 +PACKAGE_CFLAGS += -I../libgpewidget
37 +PACKAGE_LDFLAGS += -L../libgpewidget
38  BUILD = ../build
39  else
40 -CFLAGS += -I/usr/include/gpe
41 +PACKAGE_CFLAGS += -I/usr/include/gpe
42  BUILD = build
43  endif
44 -LDFLAGS += -lgpewidget $(GTKLDFLAGS)
45 +PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS)
46  
47  OBJS = $(patsubst %,%.o,$(MEMBERS))
48  SOURCES = $(patsubst %,%.c,$(MEMBERS))
49 @@ -35,7 +35,7 @@
50  all: $(PACKAGE)
51  
52  $(PACKAGE): $(OBJS) $(LIB)
53 -       $(CC) -o $@ $^ $(LDFLAGS)
54 +       $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
55  
56  install-program: all $(PACKAGE).desktop
57         mkdir -p $(DESTDIR)$(PREFIX)/bin