org.handhelds.familiar/packages/gpe-watch/gpe-watch-0.10/fix_makefile.patch

   1 diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile
   2 --- ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile        2004-08-03 15:43:54.000000000 +0100
   3 +++ gpe-watch-0.10/Makefile     2004-08-03 16:08:52.000000000 +0100
   4 @@ -8,26 +8,26 @@
   5  MEMBERS = gpe-watch
   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/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
  10
  11 -CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
  12 +PACKAGE_CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
  13  ifeq ($(DEBUG),yes)
  14  CFLAGS += -O2 -g
  15 -LDFLAGS = -g #-lefence
  16 +LDFLAGS += -g #-lefence
  17  else
  18  CFLAGS += -Os -fomit-frame-pointer
  19  endif
  20 -CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  21 +PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  22
  23  ifeq ($(CVSBUILD),yes)
  24 -CFLAGS += -I../libgpewidget
  25 -LDFLAGS += -L../libgpewidget
  26 +PACKAGE_CFLAGS += -I../libgpewidget
  27 +PACKAGE_LDFLAGS += -L../libgpewidget
  28  BUILD = ../build
  29  else
  30 -CFLAGS += -I/usr/include/gpe
  31 +PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
  32  BUILD = build
  33  endif
  34 -LDFLAGS += -lgpewidget $(GTKLDFLAGS)
  35 +PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS)
  36
  37  OBJS = $(patsubst %,%.o,$(MEMBERS))
  38  SOURCES = $(patsubst %,%.c,$(MEMBERS))
  39 @@ -35,7 +35,7 @@
  40  all: $(PACKAGE)
  41
  42  $(PACKAGE): $(OBJS) $(LIB)
  43 -       $(CC) -o $@ $^ $(LDFLAGS)
  44 +       $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
  45
  46  install-program: all $(PACKAGE).desktop
  47         mkdir -p $(DESTDIR)$(PREFIX)/bin