org.handhelds.familiar/packages/minipredict/minipredict/fix-makefile.patch

   1 diff -urNd ../minipredict-1.0-r0/minipredict/Makefile minipredict/Makefile
   2 --- ../minipredict-1.0-r0/minipredict/Makefile  2003-02-15 23:14:40 +00:00
   3 +++ minipredict/Makefile        2005-03-04 05:23:24 +00:00
   4 @@ -1,18 +1,16 @@
   5
   6 -CC = gcc
   7 -CFLAGS = -O2 `pkg-config gtk+-2.0 --cflags`
   8 -LIBS = -L/usr/X11R6/lib -lX11 -lXtst `pkg-config gtk+-2.0 --libs` -L../libdictionary -ldictionary -lz
   9 +PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
  10 +PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -lX11 -lXtst -ldictionary -lz
  11
  12 -all:   minipredict.o
  13 -       $(CC) minipredict.o  -o minipredict $(LIBS)
  14 +all:   minipredict
  15
  16 -minipredict.o: minipredict.c
  17 -       $(CC) $(CFLAGS) -c minipredict.c
  18 +minipredict: minipredict.o
  19 +       $(CC) $^ -o $@ $(LDFLAGS) $(PACKAGE_LDFLAGS)
  20
  21 -ipkg:  all
  22 -       strip minipredict
  23 -       cp minipredict ipkg/usr/bin
  24 -       ipkg-build ipkg
  25 +%.o:   %.c
  26 +       $(CC) $(CFLAGS) $(PACKAGE_CFLAGS) -c $^
  27
  28  clean:
  29 -       rm -f *.o minipredict
  30 +       rm -f *.o minipredict
  31 +
  32 +include Makefile.dpkg_ipkg
  33 diff -urNd ../minipredict-1.0-r0/minipredict/Makefile.dpkg_ipkg minipredict/Makefile.dpkg_ipkg
  34 --- ../minipredict-1.0-r0/minipredict/Makefile.dpkg_ipkg        1970-01-01 01:00:00 +01:00
  35 +++ minipredict/Makefile.dpkg_ipkg      2005-03-04 04:24:46 +00:00
  36 @@ -0,0 +1,114 @@
  37 +## Please read the README in this directory to see how to use this
  38 +## Makefile snippet
  39 +
  40 +# Let's use whatever clean target the specific app provides
  41 +
  42 +CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
  43 +
  44 +# URL to source tarball
  45 +SOURCE = ftp://gpe.handhelds.org/gpe/source/$(PACKAGE)-$(VERSION).tar.gz
  46 +
  47 +# can change this to e.g. /var/tmp/deb
  48 +DEB_PATH = ../deb
  49 +
  50 +ifeq ($(CVSBUILD),yes)
  51 +LIBGPEWIDGET_PC = libgpewidget-uninstalled
  52 +PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
  53 +else
  54 +LIBGPEWIDGET_PC = libgpewidget
  55 +endif
  56 +
  57 +ifeq ($(IN_LIBGPEWIDGET),)
  58 +GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
  59 +GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
  60 +endif
  61 +
  62 +GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
  63 +GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
  64 +
  65 +STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
  66 +STANDARD_CFLAGS = -MD -Wall
  67 +
  68 +ifeq ($(DEBUG),yes)
  69 +CFLAGS += -O2 -g
  70 +LDFLAGS = -g
  71 +else
  72 +CFLAGS += -Os -fomit-frame-pointer
  73 +endif
  74 +
  75 +dist: check-source clean dist-prep
  76 +       rm -rf ../$(PACKAGE)-$(VERSION)
  77 +       mkdir ../$(PACKAGE)-$(VERSION)
  78 +       ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
  79 +       ( cd ../$(PACKAGE)-$(VERSION); mkdir build; cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ ; sed 's:^CVSBUILD.*:CVSBUILD = no:' < Makefile > Makefile.new; mv Makefile.new Makefile )
  80 +       ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
  81 +       rm -rf ../$(PACKAGE)-$(VERSION)
  82 +       $(MAKE) printinfo
  83 +
  84 +dist-upload: dist
  85 +       scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/
  86 +
  87 +dist-prep:
  88 +ipkg-prep:
  89 +install-mo:
  90 +# empty, can be filled in Makefile.translation
  91 +
  92 +install: install-program install-mo
  93 +
  94 +clean-dist:
  95 +       rm -rf familiar/dist familiar/dist.list
  96 +
  97 +clean: clean-dist
  98 +
  99 +check-source:
 100 +       @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
 101 +
 102 +ipkg: check-source ipkg-prep clean
 103 +       rm -rf familiar/dist
 104 +       mkdir -p familiar/dist/CONTROL
 105 +       sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
 106 +       if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
 107 +       if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
 108 +       if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
 109 +       if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
 110 +       if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
 111 +       $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
 112 +       rm -rf familiar/dist.list
 113 +       ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
 114 +       if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
 115 +       md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
 116 +       rm -rf familiar/dist familiar/dist.list
 117 +       $(MAKE) printinfo
 118 +
 119 +dpkg: dist
 120 +       mkdir -p $(DEB_PATH)
 121 +       ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
 122 +       mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
 123 +       for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
 124 +
 125 +CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
 126 +printinfo:
 127 +       @printf '-------------------------------------------------------------------------------\n'
 128 +       @printf "If this becomes a package release, please add a CVS tag.\n"
 129 +       @printf "You can use 'make tag' for that, it will execute\n"
 130 +       @printf "   cvs tag %s\n" $(CVSTAG)
 131 +       @printf "Please upload a tarball (created with 'make dist') to\n"
 132 +       @printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
 133 +       @printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
 134 +       @printf "You can use 'make dist-upload' to do that.\n"
 135 +       @printf "You are currently known as USER %s.\n" $(USER)
 136 +       @printf '-------------------------------------------------------------------------------\n'
 137 +
 138 +tag: check-source
 139 +       cvs tag $(CVSTAG)
 140 +
 141 +retag: check-source
 142 +       cvs tag -F $(CVSTAG)
 143 +
 144 +source: tag dist-upload
 145 +
 146 +%.pc: %.pc.in
 147 +       sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
 148 +
 149 +.c.o:;
 150 +       $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@