org.handhelds.familiar/packages/gpe-plucker/gpe-plucker/fix_makefiles.patch

   1 diff -urNd ../gpe-plucker-0.1-r0/gpe-plucker-0.1/Makefile gpe-plucker-0.1/Makefile
   2 --- ../gpe-plucker-0.1-r0/gpe-plucker-0.1/Makefile      2004-08-03 04:09:37.000000000 +0100
   3 +++ gpe-plucker-0.1/Makefile    2004-08-03 13:36:22.000000000 +0100
   4 @@ -8,40 +8,42 @@
   5  MEMBERS = gpe-plucker
   6
   7  GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
   8 -#GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama
   9 -GTKLDFLAGS += -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama
  10 +#GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
  11 +GTKLDFLAGS += -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
  12
  13 -CFLAGS = $(GTKCFLAGS) -Iunpluck/ -DUSE_GPE -D_GNU_SOURCE -Wall
  14 +PACKAGE_CFLAGS = $(GTKCFLAGS) -Iunpluck/ -DUSE_GPE -D_GNU_SOURCE -Wall
  15  ifeq ($(DEBUG),yes)
  16 -CFLAGS += -O2 -g
  17 -LDFLAGS = -g #-lefence
  18 +PACKAGE_CFLAGS += -O2 -g
  19 +PACKAGE_LDFLAGS = -g #-lefence
  20  else
  21 -CFLAGS += -Os -fomit-frame-pointer
  22 +PACKAGE_CFLAGS += -Os -fomit-frame-pointer
  23  endif
  24 -CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  25 +PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  26
  27  ifeq ($(CVSBUILD),yes)
  28 -CFLAGS += -I../libgpewidget
  29 -LDFLAGS += -L../libgpewidget
  30 +PACKAGE_CFLAGS += -I../libgpewidget
  31 +PACKAGE_LDFLAGS += -L../libgpewidget
  32  BUILD = ../build
  33  else
  34 -CFLAGS += -I/usr/include/gpe
  35 +PACKAGE_CFLAGS += -I/usr/include/gpe
  36  BUILD = build
  37  endif
  38 -LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck/ -lunpluck -lz
  39 +PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck -lunpluck -lz
  40
  41  #OBJS = $(patsubst %,%.o,$(MEMBERS))
  42  #SOURCES = $(patsubst %,%.c,$(MEMBERS))
  43  SOURCES = image.c library.c viewer.c
  44  OBJS = ${SOURCES:.c=.o}
  45
  46 +.PHONY: unpluck
  47 +
  48  all: unpluck $(PACKAGE)
  49
  50  unpluck:
  51 -       (cd unpluck; make)
  52 +       make -C unpluck
  53
  54  $(PACKAGE): $(OBJS) $(LIB)
  55 -       $(CC) -o $@ $^ $(LDFLAGS)
  56 +       $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
  57
  58  install-program: all $(PACKAGE).desktop
  59         mkdir -p $(DESTDIR)$(PREFIX)/bin
  60 diff -urNd ../gpe-plucker-0.1-r0/gpe-plucker-0.1/unpluck/Makefile gpe-plucker-0.1/unpluck/Makefile
  61 --- ../gpe-plucker-0.1-r0/gpe-plucker-0.1/unpluck/Makefile      2003-11-24 00:32:30.000000000 +0000
  62 +++ gpe-plucker-0.1/unpluck/Makefile    2004-08-03 13:32:01.000000000 +0100
  63 @@ -5,15 +5,14 @@
  64  # -DFILE_SEPARATOR_CHAR_S="/"
  65  # -DOS_SECTION_NAME="posix"
  66
  67 -CC     =       gcc
  68  AR     =       ar
  69  RANLIB =       ranlib
  70
  71 -CFLAGS =       -Wall -O2 -g
  72 +PACKAGE_CFLAGS =       -Wall -O2 -g
  73
  74 -CFLAGS +=      -DPLUCKER_VERSION="1.6.1" -DPLUCKER_CONFIG_DIR="/etc"
  75 -CFLAGS +=      -DSYS_CONFIG_FILE_NAME="pluckerrc" -DUSER_CONFIG_FILE_NAME=".pluckerrc"
  76 -CFLAGS +=      -DFILE_SEPARATOR_CHAR_S="/" -DOS_SECTION_NAME="posix"
  77 +PACKAGE_CFLAGS +=      -DPLUCKER_VERSION="1.6.1" -DPLUCKER_CONFIG_DIR="/etc"
  78 +PACKAGE_CFLAGS +=      -DSYS_CONFIG_FILE_NAME="pluckerrc" -DUSER_CONFIG_FILE_NAME=".pluckerrc"
  79 +PACKAGE_CFLAGS +=      -DFILE_SEPARATOR_CHAR_S="/" -DOS_SECTION_NAME="posix"
  80
  81  SRC    =       config.c unpluck.c util.c
  82  OBJS   =       ${SRC:.c=.o}