summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-21 23:41:53 (UTC)
committer mickeyl <mickeyl>2004-01-21 23:41:53 (UTC)
commita428ff7937dae04b1b51d3e91f46c74f4f869543 (patch) (unidiff)
tree35e266a250a893ad3eb7b934296538ea82722954
parentcc5d48b188c21ff873300179264ab354d4c8aa09 (diff)
downloadopie-a428ff7937dae04b1b51d3e91f46c74f4f869543.zip
opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.tar.gz
opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.tar.bz2
catch up with moves on cvs server
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make22
-rw-r--r--libopie2/opiecore/device/.cvsignore6
-rw-r--r--libopie2/opiecore/device/device.pro19
-rw-r--r--libopie2/opiecore/libopiecore2.control2
-rw-r--r--libopie2/opiecore/opiecore.pro23
-rw-r--r--libopie2/opieui/fileselector/.cvsignore6
-rw-r--r--libopie2/opieui/fileselector/fileselector.pro8
-rw-r--r--libopie2/opieui/libopieui2.control4
-rw-r--r--libopie2/opieui/opieui.pro9
9 files changed, 61 insertions, 38 deletions
diff --git a/Rules.make b/Rules.make
index eaa2191..0360cc6 100644
--- a/Rules.make
+++ b/Rules.make
@@ -47,134 +47,140 @@ ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
47endif 47endif
48ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) 48ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
49 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ 49 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
50endif 50endif
51ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 51ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
52 echo DEFINES += OPIE_NEW_MALLOC >> $@ 52 echo DEFINES += OPIE_NEW_MALLOC >> $@
53endif 53endif
54ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 54ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
55 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 55 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
56endif 56endif
57 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 57 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
58$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 58$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
59 @echo Generating dependency information... 59 @echo Generating dependency information...
60# add to subdir-y, and add descend rules 60# add to subdir-y, and add descend rules
61 @cat $(TOPDIR)/packages | grep -v '^#' | \ 61 @cat $(TOPDIR)/packages | grep -v '^#' | \
62 awk '{print \ 62 awk '{print \
63 ".PHONY : " $$2 "\n" \ 63 ".PHONY : " $$2 "\n" \
64 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 64 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
65 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 65 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
66 cat $(TOPDIR)/packages | grep -v '^#' | \ 66 cat $(TOPDIR)/packages | grep -v '^#' | \
67 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 67 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
68 >> $(TOPDIR)/.depends 68 >> $(TOPDIR)/.depends
69# interpackage dependency generation 69# interpackage dependency generation
70 @cat $(TOPDIR)/packages | \ 70 @cat $(TOPDIR)/packages | \
71 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 71 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
72 72
73$(TOPDIR)/.depends.cfgs: 73$(TOPDIR)/.depends.cfgs:
74# config.in interdependencies 74# config.in interdependencies
75 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 75 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
76 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 76 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
77 @-rm -f dirs 77 @-rm -f dirs
78 78
79$(QTDIR)/stamp-headers : 79$(QTDIR)/stamp-headers :
80 @-rm -f $(QTDIR)/stamp-headers* 80 @-rm -f $(QTDIR)/stamp-headers*
81 ( cd $(QTDIR)/include; \ 81 ( cd $(QTDIR)/include; \
82 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 82 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
83 qcopchannel_qws.h qwindowsystem_qws.h \ 83 qcopchannel_qws.h qwindowsystem_qws.h \
84 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 84 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
85 touch $@ 85 touch $@
86 86
87$(QTDIR)/stamp-headers-x11 : 87$(QTDIR)/stamp-headers-x11 :
88 @-rm -f $(QTDIR)/stamp-headers* 88 @-rm -f $(QTDIR)/stamp-headers*
89 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 89 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
90 touch $@ 90 touch $@
91 91
92$(OPIEDIR)/stamp-headers : 92$(OPIEDIR)/stamp-headers :
93 @-rm -f $(OPIEDIR)/stamp-headers* 93 @-rm -f $(OPIEDIR)/stamp-headers*
94 mkdir -p $(TOPDIR)/include/qpe \ 94 mkdir -p $(TOPDIR)/include/qpe \
95 $(TOPDIR)/include/qtopia \ 95 $(TOPDIR)/include/qtopia \
96 $(TOPDIR)/include/opie \ 96 $(TOPDIR)/include/opie \
97 $(TOPDIR)/include/opie2 \ 97 $(TOPDIR)/include/opie2 \
98 $(TOPDIR)/include/qtopia/private 98 $(TOPDIR)/include/qtopia/private
99 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 99 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
100 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 100 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
101 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 101 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
102 # libopie1
102 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 103 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
103 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 104 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
104 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) 105 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
106 # libopie2
105 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 107 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
108 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
106 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 109 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
107 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 110 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
108 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 111 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
109 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 112 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
110 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 113 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
111 ( cd include/opie && ln -sf ../../libqtaux/pim/*.h .; ) 114 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
115 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
116 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
117 # all
112 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 118 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
113 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 119 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
114 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 120 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
115 touch $@ 121 touch $@
116 122
117$(OPIEDIR)/stamp-headers-x11 : 123$(OPIEDIR)/stamp-headers-x11 :
118 @-rm -f $(OPIEDIR)/stamp-headers* 124 @-rm -f $(OPIEDIR)/stamp-headers*
119 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 125 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
120 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 126 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
121 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 127 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
122 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 128 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
123 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 129 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
124 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 130 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
125 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 131 ( cd include/opie && ln -sf ../../libsql/*.h .; )
126 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 132 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
127 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 133 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
128 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 134 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
129 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 135 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
130 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 136 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
131 touch $@ 137 touch $@
132 138
133$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 139$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
134 @-rm -f $@ 140 @-rm -f $@
135 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 141 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
136 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 142 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
137 @touch $@ 143 @touch $@
138 144
139$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake: 145$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
140 @$(call descend,$(shell dirname $@),$(shell basename $@)) 146 @$(call descend,$(shell dirname $@),$(shell basename $@))
141 147
142menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 148menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
143 $(TOPDIR)/scripts/kconfig/mconf ./config.in 149 $(TOPDIR)/scripts/kconfig/mconf ./config.in
144 @touch ./.config.stamp 150 @touch ./.config.stamp
145 151
146xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 152xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
147 $(TOPDIR)/scripts/kconfig/qconf ./config.in 153 $(TOPDIR)/scripts/kconfig/qconf ./config.in
148 @touch .config.stamp 154 @touch .config.stamp
149 155
150gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 156gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
151 $(TOPDIR)/scripts/kconfig/gconf ./config.in 157 $(TOPDIR)/scripts/kconfig/gconf ./config.in
152 @touch .config.stamp 158 @touch .config.stamp
153 159
154config: $(TOPDIR)/scripts/kconfig/conf ./config.in 160config: $(TOPDIR)/scripts/kconfig/conf ./config.in
155 $(TOPDIR)/scripts/kconfig/conf ./config.in 161 $(TOPDIR)/scripts/kconfig/conf ./config.in
156 @touch .config.stamp 162 @touch .config.stamp
157 163
158oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 164oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
159 $(TOPDIR)/scripts/kconfig/conf -o ./config.in 165 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
160 @touch .config.stamp 166 @touch .config.stamp
161 167
162randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 168randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
163 $(TOPDIR)/scripts/kconfig/conf -r ./config.in 169 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
164 @touch .config.stamp 170 @touch .config.stamp
165 171
166allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 172allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
167 $(TOPDIR)/scripts/kconfig/conf -y ./config.in 173 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
168 @touch .config.stamp 174 @touch .config.stamp
169 175
170allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 176allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
171 $(TOPDIR)/scripts/kconfig/conf -n ./config.in 177 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
172 @touch .config.stamp 178 @touch .config.stamp
173 179
174defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 180defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
175 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 181 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
176 @touch .config.stamp 182 @touch .config.stamp
177 183
178$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 184$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
179 185
180$(TOPDIR)/mkspecs/default : 186$(TOPDIR)/mkspecs/default :
diff --git a/libopie2/opiecore/device/.cvsignore b/libopie2/opiecore/device/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/opiecore/device/.cvsignore
@@ -0,0 +1,6 @@
1Makefile*
2moc*
3*moc
4*.o
5~*
6
diff --git a/libopie2/opiecore/device/device.pro b/libopie2/opiecore/device/device.pro
new file mode 100644
index 0000000..946bff1
--- a/dev/null
+++ b/libopie2/opiecore/device/device.pro
@@ -0,0 +1,19 @@
1HEADERS += device/odevice.h \
2 device/odevicebutton.h \
3 device/odevice_ipaq.h \
4 device/odevice_jornada.h \
5 device/odevice_ramses.h \
6 device/odevice_simpad.h \
7 device/odevice_zaurus.h \
8 device/odevice_yopy.h \
9
10SOURCES += device/odevice.cpp \
11 device/odevicebutton.cpp \
12 device/odevice_ipaq.cpp \
13 device/odevice_jornada.cpp\
14 device/odevice_ramses.cpp \
15 device/odevice_simpad.cpp \
16 device/odevice_zaurus.cpp \
17 device/odevice_yopy.cpp \
18
19
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control
index f0a3afc..4679f28 100644
--- a/libopie2/opiecore/libopiecore2.control
+++ b/libopie2/opiecore/libopiecore2.control
@@ -1,11 +1,11 @@
1Package: libopiecore2 1Package: libopiecore2
2Files: $OPIEDIR/lib/libopiecore2.so.* 2Files: $OPIEDIR/lib/libopiecore2.so.*
3Priority: optional 3Priority: optional
4Section: opie/system 4Section: opie/system
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 1.8.3-$SUB_VERSION.2 7Version: 1.8.5-$SUB_VERSION.1
8Depends: libqpe1 8Depends: libqpe1
9Provides: libopiecore2 9Provides: libopiecore2
10Description: Opie library 2.0 CORE 10Description: Opie library 2.0 CORE
11 11
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 98d315f..7a75a02 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,55 +1,38 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on debug
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oapplication.h \ 4HEADERS = oapplication.h \
5 oconfig.h \ 5 oconfig.h \
6 odebug.h \ 6 odebug.h \
7 odevice.h \
8 odevicebutton.h \
9 odevice_ipaq.h \
10 odevice_jornada.h \
11 odevice_ramses.h \
12 odevice_simpad.h \
13 odevice_zaurus.h \
14 odevice_yopy.h \
15 oglobal.h \ 7 oglobal.h \
16 oglobalsettings.h \ 8 oglobalsettings.h \
17 oprocess.h \ 9 oprocess.h \
18 oprocctrl.h \ 10 oprocctrl.h \
19 ostorageinfo.h 11 ostorageinfo.h
20 12
21SOURCES = oapplication.cpp \ 13SOURCES = oapplication.cpp \
22 oconfig.cpp \ 14 oconfig.cpp \
23 odebug.cpp \ 15 odebug.cpp \
24 odevice.cpp \
25 odevicebutton.cpp \
26 odevice_ipaq.cpp \
27 odevice_jornada.cpp \
28 odevice_ramses.cpp \
29 odevice_simpad.cpp \
30 odevice_zaurus.cpp \
31 odevice_yopy.cpp \
32 oglobal.cpp \ 16 oglobal.cpp \
33 oglobalsettings.cpp \ 17 oglobalsettings.cpp \
34 oprocess.cpp \ 18 oprocess.cpp \
35 oprocctrl.cpp \ 19 oprocctrl.cpp \
36 ostorageinfo.cpp 20 ostorageinfo.cpp
37 21
22include ( device/device.pro )
23
38INTERFACES = 24INTERFACES =
39TARGET = opiecore2 25TARGET = opiecore2
40VERSION = 1.8.3 26VERSION = 1.8.5
41INCLUDEPATH += $(OPIEDIR)/include 27INCLUDEPATH += $(OPIEDIR)/include
42DEPENDPATH += $(OPIEDIR)/include 28DEPENDPATH += $(OPIEDIR)/include
43MOC_DIR = moc
44OBJECTS_DIR = obj
45
46 29
47!contains( platform, x11 ) { 30!contains( platform, x11 ) {
48 LIBS = -lqpe 31 LIBS = -lqpe
49 include ( $(OPIEDIR)/include.pro ) 32 include ( $(OPIEDIR)/include.pro )
50} 33}
51 34
52contains( platform, x11 ) { 35contains( platform, x11 ) {
53 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 36 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
54} 37}
55 38
diff --git a/libopie2/opieui/fileselector/.cvsignore b/libopie2/opieui/fileselector/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/opieui/fileselector/.cvsignore
@@ -0,0 +1,6 @@
1Makefile*
2moc*
3*moc
4*.o
5~*
6
diff --git a/libopie2/opieui/fileselector/fileselector.pro b/libopie2/opieui/fileselector/fileselector.pro
new file mode 100644
index 0000000..cbbd588
--- a/dev/null
+++ b/libopie2/opieui/fileselector/fileselector.pro
@@ -0,0 +1,8 @@
1HEADERS += fileselector/ofileselector.h \
2 fileselector/ofileselector_p.h \
3 fileselector/ofiledialog.h \
4 fileselector/ofileview.h \
5
6SOURCES += fileselector/ofileselector.cpp \
7 fileselector/ofiledialog.cpp \
8
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control
index 71e6358..6f61f53 100644
--- a/libopie2/opieui/libopieui2.control
+++ b/libopie2/opieui/libopieui2.control
@@ -1,11 +1,11 @@
1Package: libopieui2 1Package: libopieui2
2Files: $OPIEDIR/lib/libopieui2.so.* 2Files: $OPIEDIR/lib/libopieui2.so.*
3Priority: optional 3Priority: optional
4Section: opie/system 4Section: opie/system
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 1.8.2-$SUB_VERSION.2 7Version: 1.8.5-$SUB_VERSION.1
8Depends: libqpe1, libopiecore2 (1.8.2) 8Depends: libqpe1, libopiecore2 (1.8.5)
9Provides: libopieui2 9Provides: libopieui2
10Description: Opie library 2.0 UI 10Description: Opie library 2.0 UI
11 11
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index b07976b..8b8ed21 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -1,69 +1,64 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on debug
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = ocheckitem.h \ 4HEADERS = ocheckitem.h \
5 oclickablelabel.h \ 5 oclickablelabel.h \
6 odialog.h \ 6 odialog.h \
7 ofileselector.h \
8 ofileselector_p.h \
9 ofiledialog.h \
10 ofileview.h \
11 ofontselector.h \ 7 ofontselector.h \
12 oimageeffect.h \ 8 oimageeffect.h \
13 olistview.h \ 9 olistview.h \
14 opixmapeffect.h \ 10 opixmapeffect.h \
15 opopupmenu.h \ 11 opopupmenu.h \
16 opixmapprovider.h \ 12 opixmapprovider.h \
17 oselector.h \ 13 oselector.h \
18 otabinfo.h \ 14 otabinfo.h \
19 otabbar.h \ 15 otabbar.h \
20 otabwidget.h \ 16 otabwidget.h \
21 otimepicker.h \ 17 otimepicker.h \
22 oversatileview.h \ 18 oversatileview.h \
23 oversatileviewitem.h \ 19 oversatileviewitem.h \
24 omessagebox.h \ 20 omessagebox.h \
25 oresource.h \ 21 oresource.h \
26 otaskbarapplet.h \ 22 otaskbarapplet.h \
27 oseparator.h 23 oseparator.h
28 24
29SOURCES = ocheckitem.cpp \ 25SOURCES = ocheckitem.cpp \
30 oclickablelabel.cpp \ 26 oclickablelabel.cpp \
31 ofileselector.cpp \
32 ofiledialog.cpp \
33 ofontselector.cpp \ 27 ofontselector.cpp \
34 oimageeffect.cpp \ 28 oimageeffect.cpp \
35 olistview.cpp \ 29 olistview.cpp \
36 opixmapeffect.cpp \ 30 opixmapeffect.cpp \
37 opopupmenu.cpp \ 31 opopupmenu.cpp \
38 opixmapprovider.cpp \ 32 opixmapprovider.cpp \
39 oselector.cpp \ 33 oselector.cpp \
40 otabbar.cpp \ 34 otabbar.cpp \
41 otabwidget.cpp \ 35 otabwidget.cpp \
42 otimepicker.cpp \ 36 otimepicker.cpp \
43 oversatileview.cpp \ 37 oversatileview.cpp \
44 oversatileviewitem.cpp \ 38 oversatileviewitem.cpp \
45 odialog.cpp \ 39 odialog.cpp \
46 oresource.cpp \ 40 oresource.cpp \
47 otaskbarapplet.cpp \ 41 otaskbarapplet.cpp \
48 oseparator.cpp 42 oseparator.cpp
49 43
50include ( big-screen/big-screen.pro ) 44include ( big-screen/big-screen.pro )
45include ( fileselector/fileselector.pro )
51 46
52INTERFACES = otimepickerbase.ui 47INTERFACES = otimepickerbase.ui
53 48
54TARGET = opieui2 49TARGET = opieui2
55VERSION = 1.8.4 50VERSION = 1.8.5
56 51
57INCLUDEPATH += $(OPIEDIR)/include 52INCLUDEPATH += $(OPIEDIR)/include
58DEPENDPATH += $(OPIEDIR)/include 53DEPENDPATH += $(OPIEDIR)/include
59 54
60LIBS += -lopiecore2 55LIBS += -lopiecore2
61 56
62!contains( platform, x11 ) { 57!contains( platform, x11 ) {
63 include ( $(OPIEDIR)/include.pro ) 58 include ( $(OPIEDIR)/include.pro )
64} 59}
65 60
66contains( platform, x11 ) { 61contains( platform, x11 ) {
67 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 62 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
68} 63}
69 64