-rw-r--r-- | Rules.make | 8 | ||||
-rw-r--r-- | libopie2/opiecore/device/.cvsignore | 6 | ||||
-rw-r--r-- | libopie2/opiecore/device/device.pro | 19 | ||||
-rw-r--r-- | libopie2/opiecore/libopiecore2.control | 2 | ||||
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 23 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/.cvsignore | 6 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/fileselector.pro | 8 | ||||
-rw-r--r-- | libopie2/opieui/libopieui2.control | 4 | ||||
-rw-r--r-- | libopie2/opieui/opieui.pro | 9 |
9 files changed, 54 insertions, 31 deletions
@@ -99,16 +99,22 @@ $(OPIEDIR)/stamp-headers : ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) + # libopie1 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) + # libopie2 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) + ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) - ( cd include/opie && ln -sf ../../libqtaux/pim/*.h .; ) + ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) + ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) + ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) + # all ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 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 @@ +Makefile* +moc* +*moc +*.o +~* + 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 @@ +HEADERS += device/odevice.h \ + device/odevicebutton.h \ + device/odevice_ipaq.h \ + device/odevice_jornada.h \ + device/odevice_ramses.h \ + device/odevice_simpad.h \ + device/odevice_zaurus.h \ + device/odevice_yopy.h \ + +SOURCES += device/odevice.cpp \ + device/odevicebutton.cpp \ + device/odevice_ipaq.cpp \ + device/odevice_jornada.cpp\ + device/odevice_ramses.cpp \ + device/odevice_simpad.cpp \ + device/odevice_zaurus.cpp \ + device/odevice_yopy.cpp \ + + 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 Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: 1.8.3-$SUB_VERSION.2 +Version: 1.8.5-$SUB_VERSION.1 Depends: libqpe1 Provides: libopiecore2 Description: 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 HEADERS = oapplication.h \ oconfig.h \ odebug.h \ - odevice.h \ - odevicebutton.h \ - odevice_ipaq.h \ - odevice_jornada.h \ - odevice_ramses.h \ - odevice_simpad.h \ - odevice_zaurus.h \ - odevice_yopy.h \ oglobal.h \ oglobalsettings.h \ oprocess.h \ @@ -21,28 +13,19 @@ HEADERS = oapplication.h \ SOURCES = oapplication.cpp \ oconfig.cpp \ odebug.cpp \ - odevice.cpp \ - odevicebutton.cpp \ - odevice_ipaq.cpp \ - odevice_jornada.cpp \ - odevice_ramses.cpp \ - odevice_simpad.cpp \ - odevice_zaurus.cpp \ - odevice_yopy.cpp \ oglobal.cpp \ oglobalsettings.cpp \ oprocess.cpp \ oprocctrl.cpp \ ostorageinfo.cpp +include ( device/device.pro ) + INTERFACES = TARGET = opiecore2 -VERSION = 1.8.3 +VERSION = 1.8.5 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -MOC_DIR = moc -OBJECTS_DIR = obj - !contains( platform, x11 ) { 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 @@ +Makefile* +moc* +*moc +*.o +~* + 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 @@ +HEADERS += fileselector/ofileselector.h \ + fileselector/ofileselector_p.h \ + fileselector/ofiledialog.h \ + fileselector/ofileview.h \ + +SOURCES += fileselector/ofileselector.cpp \ + fileselector/ofiledialog.cpp \ + 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 Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: 1.8.2-$SUB_VERSION.2 -Depends: libqpe1, libopiecore2 (1.8.2) +Version: 1.8.5-$SUB_VERSION.1 +Depends: libqpe1, libopiecore2 (1.8.5) Provides: libopieui2 Description: Opie library 2.0 UI 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 HEADERS = ocheckitem.h \ oclickablelabel.h \ odialog.h \ - ofileselector.h \ - ofileselector_p.h \ - ofiledialog.h \ - ofileview.h \ ofontselector.h \ oimageeffect.h \ olistview.h \ @@ -28,8 +24,6 @@ HEADERS = ocheckitem.h \ SOURCES = ocheckitem.cpp \ oclickablelabel.cpp \ - ofileselector.cpp \ - ofiledialog.cpp \ ofontselector.cpp \ oimageeffect.cpp \ olistview.cpp \ @@ -48,11 +42,12 @@ SOURCES = ocheckitem.cpp \ oseparator.cpp include ( big-screen/big-screen.pro ) +include ( fileselector/fileselector.pro ) INTERFACES = otimepickerbase.ui TARGET = opieui2 -VERSION = 1.8.4 +VERSION = 1.8.5 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include |