Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 101393 | Differences between
and this patch

Collapse All | Expand All

(-)../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg (-6 / +16 lines)
Lines 18-25 Link Here
18
LIBGPEWIDGET_PC = libgpewidget
18
LIBGPEWIDGET_PC = libgpewidget
19
endif
19
endif
20
20
21
ifeq ($(IN_LIBGPEWIDGET),)
21
GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
22
GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
22
GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
23
GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
24
endif
23
25
24
GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
26
GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
25
GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
27
GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
Lines 28-43 Link Here
28
STANDARD_CFLAGS = -MD -Wall
30
STANDARD_CFLAGS = -MD -Wall
29
31
30
ifeq ($(DEBUG),yes)
32
ifeq ($(DEBUG),yes)
31
STANDARD_CFLAGS += -O2 -g
33
CFLAGS += -O2 -g
32
STANDARD_LDFLAGS = -g
34
LDFLAGS = -g
33
else
35
else
34
STANDARD_CFLAGS += -Os -fomit-frame-pointer
36
CFLAGS += -Os -fomit-frame-pointer
35
endif
37
endif
36
38
37
dist: check-source clean dist-prep
39
dist: check-source clean dist-prep
38
	rm -rf ../$(PACKAGE)-$(VERSION)
40
	rm -rf ../$(PACKAGE)-$(VERSION)
39
	mkdir ../$(PACKAGE)-$(VERSION)
41
	mkdir ../$(PACKAGE)-$(VERSION)
40
	( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.d" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
42
	( 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 -)
41
	( 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 )
43
	( 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 )
42
	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
44
	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
43
	rm -rf ../$(PACKAGE)-$(VERSION)
45
	rm -rf ../$(PACKAGE)-$(VERSION)
Lines 53-60 Link Here
53
55
54
install: install-program install-mo
56
install: install-program install-mo
55
57
58
clean-dist:
59
	rm -rf familiar/dist familiar/dist.list
60
61
clean: clean-dist
62
56
check-source:
63
check-source:
57
	@if ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
64
	@if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
58
65
59
ipkg: check-source ipkg-prep clean
66
ipkg: check-source ipkg-prep clean
60
	rm -rf familiar/dist
67
	rm -rf familiar/dist
Lines 68-76 Link Here
68
	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
75
	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
69
	rm -rf familiar/dist.list
76
	rm -rf familiar/dist.list
70
	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
77
	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
71
	rm -f 
72
	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
78
	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
73
	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
79
	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
80
	rm -rf familiar/dist familiar/dist.list
74
	$(MAKE) printinfo
81
	$(MAKE) printinfo
75
82
76
dpkg: dist
83
dpkg: dist
Lines 102-104 Link Here
102
109
103
%.pc: %.pc.in
110
%.pc: %.pc.in
104
	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
111
	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
112
113
.c.o:;
114
	$(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
(-)../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation (-5 / +11 lines)
Lines 5-11 Link Here
5
# use ipkg-build or ipkg-deb-build
5
# use ipkg-build or ipkg-deb-build
6
IPKG_BUILD := ipkg-build
6
IPKG_BUILD := ipkg-build
7
7
8
TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint/
8
TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
9
9
10
ifeq ($(DIR_PO),)
10
ifeq ($(DIR_PO),)
11
DIR_PO := po
11
DIR_PO := po
Lines 56-62 Link Here
56
	( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
56
	( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
57
	if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
57
	if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
58
58
59
clean: clean-po
59
clean: clean-po clean-dist-translation
60
60
61
clean-po:
61
clean-po:
62
	rm -rf $(DIR_PO)/*.mo
62
	rm -rf $(DIR_PO)/*.mo
Lines 76-85 Link Here
76
76
77
MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
77
MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
78
78
79
ifndef BUILD
80
BUILD = ../build
81
endif
82
79
transdist := familiar/dist-translation
83
transdist := familiar/dist-translation
80
templates := ../build/familiar
84
templates := $(BUILD)/familiar
81
ipkglist  := translation-ipkgs.txt
85
ipkglist  := translation-ipkgs.txt
82
86
87
clean-dist-translation:
88
	rm -rf $(transdist) $(ipkglist)
89
83
real-translation-package: all-mo
90
real-translation-package: all-mo
84
	rm -rf $(transdist) $(ipkglist)
91
	rm -rf $(transdist) $(ipkglist)
85
	for LINGUA in $(LINGUAS); do \
92
	for LINGUA in $(LINGUAS); do \
Lines 89-96 Link Here
89
		install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
96
		install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
90
		sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
97
		sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
91
		install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
98
		install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
92
		chown -R root.root $(transdist)/$$i; \
99
		$(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
93
		$(IPKG_BUILD) $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
94
	done
100
	done
95
101
96
translation-ipkg:
102
translation-ipkg:
(-)../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c (-6 / +6 lines)
Lines 16-27 Link Here
16
#include "sgf.h"
16
#include "sgf.h"
17
17
18
//--GPE libs
18
//--GPE libs
19
#include "gpe/init.h"
19
#include <gpe/init.h>
20
#include "gpe/pixmaps.h"
20
#include <gpe/pixmaps.h>
21
#include "gpe/errorbox.h"
21
#include <gpe/errorbox.h>
22
#include "gpe/question.h"
22
#include <gpe/question.h>
23
#include "gpe/popup_menu.h"
23
#include <gpe/popup_menu.h>
24
#include "gpe/picturebutton.h"
24
#include <gpe/picturebutton.h>
25
25
26
//--i18n
26
//--i18n
27
#include <libintl.h>
27
#include <libintl.h>
(-)../gpe-go-0.05-r0/gpe-go-0.05/Makefile (-40 / +14 lines)
Lines 1-19 Link Here
1
VERSION = 0.05
1
VERSION = 0.05
2
3
PACKAGE = gpe-go
2
PACKAGE = gpe-go
4
3
PREFIX = /usr
5
ifndef PREFIX
6
PREFIX = /usr/local
7
endif
8
9
ifndef DEBUG
10
DEBUG = no
4
DEBUG = no
11
endif
12
13
ifndef CVSBUILD
14
CVSBUILD = no
5
CVSBUILD = no
15
endif
16
17
6
18
LINGUAS = cs de pl ro sv nl fr pt ru
7
LINGUAS = cs de pl ro sv nl fr pt ru
19
8
Lines 21-60 Link Here
21
10
22
PIXMAPS = board white.png black.png
11
PIXMAPS = board white.png black.png
23
12
24
GTKCFLAGS   = `pkg-config --cflags gtk+-2.0`
13
GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
25
GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
14
GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0`
26
15
27
CPPFLAGS = $(GTKCFLAGS) -D_GNU_SOURCE 
16
PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS)
28
ifeq ($(DEBUG),yes)
17
PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
29
CFLAGS  += -O2 -g -DDEBUG=yes
18
PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS)
30
LDFLAGS += -g
19
20
ifeq ($(CVSBUILD),yes)
21
BUILD = ../build
31
else
22
else
32
CFLAGS += -Os -fomit-frame-pointer
23
BUILD = build
33
endif
24
endif
34
CFLAGS += -Wall -I../../base/libgpewidget
35
CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
36
CFLAGS += -MD
37
38
LDFLAGS += -L../../base/libgpewidget -lgpewidget
39
40
.SUFFIXES: .d
41
25
42
OBJS = $(patsubst %,%.o,$(MEMBERS))
26
OBJS = $(patsubst %,%.o,$(MEMBERS))
43
DEPS = $(patsubst %,%.d,$(MEMBERS))
44
SOURCES = $(patsubst %,%.c,$(MEMBERS))
27
SOURCES = $(patsubst %,%.c,$(MEMBERS))
28
DEPS = $(patsubst %,%.d,$(MEMBERS))
45
29
46
ifdef DESKTOP #environement variable to set if you want extra code included.
30
ifdef DESKTOP #environement variable to set if you want extra code included.
47
CPPFLAGS += -DDESKTOP
31
PACKAGE_CPPFLAGS += -DDESKTOP
48
endif
32
endif
49
33
50
all: $(PACKAGE)
34
all: $(PACKAGE)
51
35
52
$(PACKAGE): $(OBJS)
36
$(PACKAGE): $(OBJS)
53
	$(CC) -o $@ $^  $(GTKLDFLAGS) $(LDFLAGS)
37
	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
54
38
55
install-program: $(PACKAGE).desktop all 
39
install-program: $(PACKAGE).desktop all 
56
	install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
40
	install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
57
	strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
58
	install -d $(DESTDIR)$(PREFIX)/share/pixmaps
41
	install -d $(DESTDIR)$(PREFIX)/share/pixmaps
59
	install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/
42
	install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/
60
	install -d $(DESTDIR)$(PREFIX)/share/applications
43
	install -d $(DESTDIR)$(PREFIX)/share/applications
Lines 69-83 Link Here
69
	find . -name "*~" -exec rm -f {} \;
52
	find . -name "*~" -exec rm -f {} \;
70
53
71
54
72
#--include GPE generic Makefiles
73
ifeq ($(CVSBUILD),yes)
74
BUILD = ../../base/build
75
else
76
BUILD = build
77
endif
78
79
include $(BUILD)/Makefile.dpkg_ipkg
55
include $(BUILD)/Makefile.dpkg_ipkg
80
include $(BUILD)/Makefile.translation
56
include $(BUILD)/Makefile.translation
81
82
83
-include $(DEPS)
57
-include $(DEPS)

Return to bug 101393