-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | include.pro | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -82,39 +82,44 @@ allnoconfig : | |||
82 | defconfig : | 82 | defconfig : |
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 | ||
87 | export | 87 | export |
88 | 88 | ||
89 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) | 89 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
90 | 90 | ||
91 | export include-config := 1 | 91 | export include-config := 1 |
92 | 92 | ||
93 | -include $(TOPDIR)/.config | 93 | -include $(TOPDIR)/.config |
94 | -include $(TOPDIR)/.depends | 94 | -include $(TOPDIR)/.depends |
95 | 95 | ||
96 | endif | 96 | endif |
97 | 97 | ||
98 | -include $(TOPDIR)/.config.cmd | 98 | -include $(TOPDIR)/.config.cmd |
99 | 99 | ||
100 | SUBDIRS = $(subdir-y) | 100 | SUBDIRS = $(subdir-y) |
101 | 101 | ||
102 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 102 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
103 | 103 | ||
104 | ifdef CONFIG_OPTIMIZATIONS | 104 | ifdef CONFIG_OPTIMIZATIONS |
105 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) | 105 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
106 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) | 106 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
107 | endif | 107 | endif |
108 | 108 | ||
109 | all clean install ipk: $(SUBDIRS) | 109 | all clean install ipk: $(SUBDIRS) |
110 | 110 | ||
111 | lupdate lrelease: | 111 | lupdate lrelease: |
112 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; | 112 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
113 | 113 | ||
114 | opie-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 | ||
118 | clean : $(TOPDIR)/.config | 121 | clean : $(TOPDIR)/.config |
119 | 122 | ||
123 | apidox : doc/generate_apidox | ||
124 | |||
120 | include $(TOPDIR)/Rules.make | 125 | include $(TOPDIR)/Rules.make |
diff --git a/include.pro b/include.pro index 4f1144f..8503aa0 100644 --- a/include.pro +++ b/include.pro | |||
@@ -26,47 +26,52 @@ sounds.path = $$prefix/sounds/$$TARGET | |||
26 | sounds.files = sounds/* | 26 | sounds.files = sounds/* |
27 | INSTALLS += sounds | 27 | INSTALLS += sounds |
28 | 28 | ||
29 | # init scripts, default path is /etc/init.d | 29 | # init scripts, default path is /etc/init.d |
30 | init.path = /etc/init.d | 30 | init.path = /etc/init.d |
31 | init.files = init.d/* | 31 | init.files = init.d/* |
32 | INSTALLS += init | 32 | INSTALLS += init |
33 | 33 | ||
34 | # data, default path is /usr/share/$$TARGET | 34 | # data, default path is /usr/share/$$TARGET |
35 | data.path = /usr/share/$$TARGET | 35 | data.path = /usr/share/$$TARGET |
36 | data.files = share/* | 36 | data.files = share/* |
37 | INSTALLS += data | 37 | INSTALLS += data |
38 | 38 | ||
39 | etc.path = $$prefix/etc/ | 39 | etc.path = $$prefix/etc/ |
40 | etc.files = etc/* | 40 | etc.files = etc/* |
41 | INSTALLS += etc | 41 | INSTALLS += etc |
42 | 42 | ||
43 | apps.path = $$prefix/apps/ | 43 | apps.path = $$prefix/apps/ |
44 | apps.files = apps/* | 44 | apps.files = apps/* |
45 | INSTALLS += apps | 45 | INSTALLS += apps |
46 | 46 | ||
47 | # sounds, default path is $$prefix/sounds/$$TARGET | 47 | # sounds, default path is $$prefix/sounds/$$TARGET |
48 | sounds.path = $$prefix/sounds/$$TARGET | 48 | sounds.path = $$prefix/sounds/$$TARGET |
49 | sounds.files = sounds/* | 49 | sounds.files = sounds/* |
50 | INSTALLS += sounds | 50 | INSTALLS += sounds |
51 | 51 | ||
52 | # anything in nonstandard paths | 52 | # anything in nonstandard paths |
53 | root.path = / | 53 | root.path = / |
54 | root.files = root/* | 54 | root.files = root/* |
55 | INSTALLS += root | 55 | INSTALLS += root |
56 | 56 | ||
57 | # new targets | 57 | # new targets |
58 | opie-lupdate.target = opie-lupdate | ||
59 | opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) | ||
60 | |||
61 | opie-lrelease.target = opie-lrelease | ||
62 | opie-lrelease.commands = opie-lrelease $(PRO) | ||
58 | 63 | ||
59 | lupdate.target = lupdate | 64 | lupdate.target = lupdate |
60 | lupdate.commands = lupdate -noobsolete $(PRO) | 65 | lupdate.commands = lupdate -noobsolete $(PRO) |
61 | 66 | ||
62 | lrelease.target = lrelease | 67 | lrelease.target = lrelease |
63 | lrelease.commands = lrelease $(PRO) | 68 | lrelease.commands = lrelease $(PRO) |
64 | 69 | ||
65 | ipk.target = ipk | 70 | ipk.target = ipk |
66 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 71 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
67 | 72 | ||
68 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk | 73 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease |
69 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 74 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
70 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 75 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
71 | 76 | ||
72 | include ( $(OPIEDIR)/gen.pro ) | 77 | include ( $(OPIEDIR)/gen.pro ) |