org.handhelds.familiar/packages/gpe-shield/gpe-shield-0.2/makefile.patch

   1 ? .tm_project.cache
   2 ? gpe-shield
   3 ? gpe-shield.desktop
   4 ? gpe-shield_0.2.batch
   5 ? gpe-shield_0.2_arm.ipk
   6 ? gpe-shield_0.2_arm.ipk.asc
   7 ? gpe-shield_0.2_arm.ipk.upload.html
   8 ? makefile.patch
   9 ? po
  10 Index: Makefile
  11 ===================================================================
  12 RCS file: /cvs/gpe/base/gpe-shield/Makefile,v
  13 retrieving revision 1.2
  14 diff -r1.2 Makefile
  15 14a15,17
  16 > GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gdk-2.0`
  17 > GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0`
  18 >
  19 16,17c19,20
  20 < GTKLDFLAGS += -L../libgpewidget -L.
  21 < CFLAGS += -Wall -I../libgpewidget -I.
  22 ---
  23 > PACKAGE_LDFLAGS += -L../libgpewidget -L.
  24 > PACKAGE_CFLAGS += -I../libgpewidget -I.
  25 20d22
  26 < GTKCFLAGS += -I$(PREFIX)/include/gpe
  27 23a26,30
  28 > PACKAGE_CPPFLAGS = $(STANDARD_CPPFLAGS)
  29 > PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS)
  30 > PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) $(GTKLDFLAGS)
  31 >
  32 >
  33 27c34
  34 < CFLAGS += -g -DDEBUG
  35 ---
  36 > PACKAGE_CFLAGS += -g -DDEBUG
  37 29c36
  38 < CFLAGS += -Os -fomit-frame-pointer
  39 ---
  40 > PACKAGE_CFLAGS += -Os -fomit-frame-pointer
  41 32,58c39,40
  42 < CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
  43 < CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  44 <
  45 < GTKCFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0`
  46 < GTKLDFLAGS += `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0`
  47 <
  48 < # setup how to compile
  49 < ifeq ($(NATIVE),yes)
  50 <
  51 < STRIP=strip
  52 < CC=gcc
  53 <
  54 < CFLAGS += $(GTKCFLAGS) -Wall
  55 < LDFLAGS += -lgpewidget $(GTKLDFLAGS)
  56 <
  57 < else # we do cross-compile...
  58 <
  59 < CC=arm-linux-gcc
  60 < STRIP=arm-linux-strip
  61 <
  62 < CFLAGS += -march=armv4 -mtune=strongarm
  63 < CFLAGS += $(GTKCFLAGS) -Wall
  64 < LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Wall
  65 < LDFLAGS += -lXinerama
  66 <
  67 < endif #native or cross-compile
  68 <
  69 ---
  70 > PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
  71 > PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  72 70c52
  73 <       $(CC) -g -o $@ $(OBJS) $(LDFLAGS) -lgpewidget $(GTKLDFLAGS)
  74 ---
  75 >       $(CC) -g -o $@ $(OBJS) $(LDFLAGS) $(PACKAGE_LDFLAGS)
  76 80c62
  77 <       for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done
  78 ---
  79 >       for i in $(PIXMAPS); do install -m 4755 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done