summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile5
-rw-r--r--include.pro7
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 52894ce..9169645 100644
--- a/Makefile
+++ b/Makefile
@@ -50,71 +50,76 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
50# at the time that they run. we must ensure that .depends.cfgs 50# at the time that they run. we must ensure that .depends.cfgs
51# is built and included by the time we reach this point. 51# is built and included by the time we reach this point.
52 52
53xconfig : 53xconfig :
54 $(call descend,scripts/kconfig,qconf) 54 $(call descend,scripts/kconfig,qconf)
55 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 55 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
56 ./scripts/kconfig/qconf ./config.in 56 ./scripts/kconfig/qconf ./config.in
57 57
58menuconfig : scripts/lxdialog/lxdialog 58menuconfig : scripts/lxdialog/lxdialog
59 $(call descend,scripts/kconfig,mconf) 59 $(call descend,scripts/kconfig,mconf)
60 ./scripts/kconfig/mconf ./config.in 60 ./scripts/kconfig/mconf ./config.in
61 61
62config : 62config :
63 $(call descend,scripts/kconfig,conf) 63 $(call descend,scripts/kconfig,conf)
64 ./scripts/kconfig/conf ./config.in 64 ./scripts/kconfig/conf ./config.in
65 65
66oldconfig : 66oldconfig :
67 $(call descend,scripts/kconfig,conf) 67 $(call descend,scripts/kconfig,conf)
68 ./scripts/kconfig/conf -o ./config.in 68 ./scripts/kconfig/conf -o ./config.in
69 69
70randconfig : 70randconfig :
71 $(call descend,scripts/kconfig,conf) 71 $(call descend,scripts/kconfig,conf)
72 ./scripts/kconfig/conf -r ./config.in 72 ./scripts/kconfig/conf -r ./config.in
73 73
74allyesconfig : 74allyesconfig :
75 $(call descend,scripts/kconfig,conf) 75 $(call descend,scripts/kconfig,conf)
76 ./scripts/kconfig/conf -y ./config.in 76 ./scripts/kconfig/conf -y ./config.in
77 77
78allnoconfig : 78allnoconfig :
79 $(call descend,scripts/kconfig,conf) 79 $(call descend,scripts/kconfig,conf)
80 ./scripts/kconfig/conf -n ./config.in 80 ./scripts/kconfig/conf -n ./config.in
81 81
82defconfig : 82defconfig :
83 $(call descend,scripts/kconfig,conf) 83 $(call descend,scripts/kconfig,conf)
84 ./scripts/kconfig/conf -d ./config.in 84 ./scripts/kconfig/conf -d ./config.in
85 85
86 86
87export 87export
88 88
89ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 89ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
90 90
91export include-config := 1 91export include-config := 1
92 92
93-include $(TOPDIR)/.config 93-include $(TOPDIR)/.config
94-include $(TOPDIR)/.depends 94-include $(TOPDIR)/.depends
95 95
96endif 96endif
97 97
98-include $(TOPDIR)/.config.cmd 98-include $(TOPDIR)/.config.cmd
99 99
100SUBDIRS = $(subdir-y) 100SUBDIRS = $(subdir-y)
101 101
102export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 102export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
103 103
104ifdef CONFIG_OPTIMIZATIONS 104ifdef CONFIG_OPTIMIZATIONS
105export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 105export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
106export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 106export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
107endif 107endif
108 108
109all clean install ipk: $(SUBDIRS) 109all clean install ipk: $(SUBDIRS)
110 110
111lupdate lrelease: 111lupdate lrelease:
112 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; 112 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
113 113
114opie-lupdate opie-lrelease:
115 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
116
114$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ 117$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
115 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ 118 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
116 $(TOPDIR)/library/custom.h 119 $(TOPDIR)/library/custom.h
117 120
118clean : $(TOPDIR)/.config 121clean : $(TOPDIR)/.config
119 122
123apidox : doc/generate_apidox
124
120include $(TOPDIR)/Rules.make 125include $(TOPDIR)/Rules.make
diff --git a/include.pro b/include.pro
index 4f1144f..8503aa0 100644
--- a/include.pro
+++ b/include.pro
@@ -1,72 +1,77 @@
1# make install 1# make install
2 2
3# base opie install path 3# base opie install path
4prefix = /opt/QtPalmtop 4prefix = /opt/QtPalmtop
5 5
6contains( TEMPLATE, lib ) { 6contains( TEMPLATE, lib ) {
7 target.path = $$prefix/lib 7 target.path = $$prefix/lib
8} 8}
9!contains( TEMPLATE, lib ) { 9!contains( TEMPLATE, lib ) {
10 target.path = $$prefix/bin 10 target.path = $$prefix/bin
11} 11}
12INSTALLS += target 12INSTALLS += target
13 13
14# ipkg control files 14# ipkg control files
15control.path = /CONTROL 15control.path = /CONTROL
16control.files = control postinst prerm postrm preinst conffiles 16control.files = control postinst prerm postrm preinst conffiles
17INSTALLS += control 17INSTALLS += control
18 18
19# images, default is $$prefix/pics/$$TARGET 19# images, default is $$prefix/pics/$$TARGET
20pics.path = $$prefix/pics/$$TARGET 20pics.path = $$prefix/pics/$$TARGET
21pics.files = pics/* 21pics.files = pics/*
22INSTALLS += pics 22INSTALLS += pics
23 23
24# sounds, default path is $$prefix/sounds/$$TARGET 24# sounds, default path is $$prefix/sounds/$$TARGET
25sounds.path = $$prefix/sounds/$$TARGET 25sounds.path = $$prefix/sounds/$$TARGET
26sounds.files = sounds/* 26sounds.files = sounds/*
27INSTALLS += sounds 27INSTALLS += sounds
28 28
29# init scripts, default path is /etc/init.d 29# init scripts, default path is /etc/init.d
30init.path = /etc/init.d 30init.path = /etc/init.d
31init.files = init.d/* 31init.files = init.d/*
32INSTALLS += init 32INSTALLS += init
33 33
34# data, default path is /usr/share/$$TARGET 34# data, default path is /usr/share/$$TARGET
35data.path = /usr/share/$$TARGET 35data.path = /usr/share/$$TARGET
36data.files = share/* 36data.files = share/*
37INSTALLS += data 37INSTALLS += data
38 38
39etc.path = $$prefix/etc/ 39etc.path = $$prefix/etc/
40etc.files = etc/* 40etc.files = etc/*
41INSTALLS += etc 41INSTALLS += etc
42 42
43apps.path = $$prefix/apps/ 43apps.path = $$prefix/apps/
44apps.files = apps/* 44apps.files = apps/*
45INSTALLS += apps 45INSTALLS += apps
46 46
47# sounds, default path is $$prefix/sounds/$$TARGET 47# sounds, default path is $$prefix/sounds/$$TARGET
48sounds.path = $$prefix/sounds/$$TARGET 48sounds.path = $$prefix/sounds/$$TARGET
49sounds.files = sounds/* 49sounds.files = sounds/*
50INSTALLS += sounds 50INSTALLS += sounds
51 51
52# anything in nonstandard paths 52# anything in nonstandard paths
53root.path = / 53root.path = /
54root.files = root/* 54root.files = root/*
55INSTALLS += root 55INSTALLS += root
56 56
57# new targets 57# new targets
58opie-lupdate.target = opie-lupdate
59opie-lupdate.commands = opie-lupdate -noobsolete $(PRO)
60
61opie-lrelease.target = opie-lrelease
62opie-lrelease.commands = opie-lrelease $(PRO)
58 63
59lupdate.target = lupdate 64lupdate.target = lupdate
60lupdate.commands = lupdate -noobsolete $(PRO) 65lupdate.commands = lupdate -noobsolete $(PRO)
61 66
62lrelease.target = lrelease 67lrelease.target = lrelease
63lrelease.commands = lrelease $(PRO) 68lrelease.commands = lrelease $(PRO)
64 69
65ipk.target = ipk 70ipk.target = ipk
66ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
67 72
68QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk 73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
69QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
70QMAKE_LIBDIR += $(OPIEDIR)/lib 75QMAKE_LIBDIR += $(OPIEDIR)/lib
71 76
72include ( $(OPIEDIR)/gen.pro ) 77include ( $(OPIEDIR)/gen.pro )