Attachment #65120 for bug #101393




PACKAGE = gpe-today
PREFIX = /usr/local
DEBUG = no
CVSBUILD = no
VERSION = 0.08
#EFENCE = yes
LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru

MEMBERS = main todo calendar date xsettings

GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
GTKLDFLAGS += `pkg-config --libs gtk+-2.0`

CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE

LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru
LDFLAGS = -lefence
endif

ifeq ($(CVSBUILD),yes)
PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc
PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc
CFLAGS = -Os -fomit-frame-pointer
endif
PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -ldisplaymigration -lsqlite -lgpepimc

MEMBERS = main todo calendar date xsettings
LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings 
CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
#CFLAGS += -MD

.SUFFIXES: .d


BUILD = build
endif

all: $(PACKAGE)

$(PACKAGE): $(OBJS)
	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)

install-program: all $(PACKAGE).desktop
	for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done




LIBGPEWIDGET_PC = libgpewidget
endif

ifeq ($(IN_LIBGPEWIDGET),)
GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
endif

GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
GTKLIBS = $(shell pkg-config --libs gtk+-2.0)

STANDARD_CFLAGS = -MD -Wall

ifeq ($(DEBUG),yes)
CFLAGS += -O2 -g
LDFLAGS = -g
else
CFLAGS += -Os -fomit-frame-pointer
endif

dist: check-source clean dist-prep
	rm -rf ../$(PACKAGE)-$(VERSION)
	mkdir ../$(PACKAGE)-$(VERSION)
	( 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 -)
	( 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 )
	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
	rm -rf ../$(PACKAGE)-$(VERSION)


install: install-program install-mo

clean-dist:
	rm -rf familiar/dist familiar/dist.list

clean: clean-dist

check-source:
	@if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi

ipkg: check-source ipkg-prep clean
	rm -rf familiar/dist

	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
	rm -rf familiar/dist.list
	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
	rm -f 
	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
	rm -rf familiar/dist familiar/dist.list
	$(MAKE) printinfo

dpkg: dist

	@printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
	@printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
	@printf "You can use 'make dist-upload' to do that.\n"
	@printf "You are currently known as USER %s.\n" $(USER)
	@printf '-------------------------------------------------------------------------------\n'

tag: check-source


%.pc: %.pc.in
	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@

.c.o:;
	$(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@

Lines 5-11 Link Here

(-)../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.translation (-5 / +11 lines)
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:

Return to bug 101393

Lines 1-32 Link Here

(-)../gpe-today-0.08-r0.orig/gpe-today-0.08/Makefile (-24 / +12 lines)
1	PACKAGE = gpe-today	1	PACKAGE = gpe-today
2	PREFIX = /usr/local	2	PREFIX = /usr/local
3	VERSION = 0.08	3	DEBUG = no
4	CVSBUILD = no	4	CVSBUILD = no
5	#DEBUG = yes	5	VERSION = 0.08
6	#EFENCE = yes
7	LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru
8
9	MEMBERS = main todo calendar date xsettings
10
11	GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
12	GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
13
14	CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE
15		6
16	ifeq ($(EFENCE),yes)	7	LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru
17	LDFLAGS = -lefence
18	endif
19		8
20	ifeq ($(DEBUG),yes)	9	ifeq ($(CVSBUILD),yes)
21	CFLAGS = -g	10	PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc
22	else	11	PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc
23	CFLAGS = -Os -fomit-frame-pointer
24	endif	12	endif
		13	PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
		14	PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
		15	PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -ldisplaymigration -lsqlite -lgpepimc
25		16
26	CFLAGS += -Wall $(GTKCFLAGS)	17	MEMBERS = main todo calendar date xsettings
27	LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings
28	CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
29	#CFLAGS += -MD
30		18
31	.SUFFIXES: .d	19	.SUFFIXES: .d
32		20
Lines 42-51 Link Here
42	BUILD = build	30	BUILD = build
43	endif	31	endif
44		32
45	all: $(PACKAGE) all-mo	33	all: $(PACKAGE)
46		34
47	$(PACKAGE): $(OBJS)	35	$(PACKAGE): $(OBJS)
48	$(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS)	36	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
49		37
50	install-program: all $(PACKAGE).desktop	38	install-program: all $(PACKAGE).desktop
51	for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done	39	for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done

Lines 18-25 Link Here

(-)../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.dpkg_ipkg (-6 / +17 lines)
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 89-94 Link Here
89	@printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n"	96	@printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n"
90	@printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n"	97	@printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n"
91	@printf "You can use 'make dist-upload' to do that.\n"	98	@printf "You can use 'make dist-upload' to do that.\n"
		99	@printf "You are currently known as USER %s.\n" $(USER)
92	@printf '-------------------------------------------------------------------------------\n'	100	@printf '-------------------------------------------------------------------------------\n'
93		101
94	tag: check-source	102	tag: check-source
Lines 101-103 Link Here
101		109
102	%.pc: %.pc.in	110	%.pc: %.pc.in
103	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 $@