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
@@ -92,28 +92,34 @@ $(QTDIR)/stamp-headers-x11 :
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 \
@@ -129,7 +135,7 @@ $(OPIEDIR)/stamp-headers-x11 :
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)),\
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
@@ -4,7 +4,7 @@ Priority: 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
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
@@ -4,14 +4,6 @@ DESTDIR = $(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 \
@@ -21,28 +13,19 @@ HEADERS = oapplication.h \
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
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
@@ -4,8 +4,8 @@ Priority: 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
@@ -4,10 +4,6 @@ DESTDIR = $(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 \
@@ -28,8 +24,6 @@ HEADERS = ocheckitem.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 \
@@ -48,11 +42,12 @@ SOURCES = ocheckitem.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