| -rw-r--r-- | Rules.make | 22 | ||||
| -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, 61 insertions, 38 deletions
@@ -1,229 +1,235 @@ .phony: force force: $(configs) : $(call makecfg,$@) $(TOPDIR)/gen.pro : $(TOPDIR)/.config echo > $@ ifneq ($(CONFIG_DEBUG),) echo CONFIG += debug >> $@ echo CONFIG -= release >> $@ else echo CONFIG -= debug >> $@ echo CONFIG += release >> $@ endif ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 echo CONFIG -= qt3 >> $@ else echo CONFIG += qt3 >> $@ endif ifneq ($(CONFIG_QUICK_LAUNCH),) echo contains\( CONFIG, quick-app \) \{ >> $@ echo CONFIG -= quick-app >> $@ echo CONFIG += quick-app-lib >> $@ echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ echo \} >> $@ else echo contains\( CONFIG, quick-app \) \{ >> $@ echo CONFIG -= quick-app >> $@ echo CONFIG += quick-app-bin >> $@ echo \} >> $@ endif ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) echo CONFIG += no-override >> $@ endif ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ endif ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ endif ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ endif ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ endif ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ endif ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) echo DEFINES += OPIE_NEW_MALLOC >> $@ endif ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ endif echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages @echo Generating dependency information... # add to subdir-y, and add descend rules @cat $(TOPDIR)/packages | grep -v '^#' | \ awk '{print \ ".PHONY : " $$2 "\n" \ "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends cat $(TOPDIR)/packages | grep -v '^#' | \ 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"; }' \ >> $(TOPDIR)/.depends # interpackage dependency generation @cat $(TOPDIR)/packages | \ $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends $(TOPDIR)/.depends.cfgs: # config.in interdependencies @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs @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 ) >> $@ @-rm -f dirs $(QTDIR)/stamp-headers : @-rm -f $(QTDIR)/stamp-headers* ( cd $(QTDIR)/include; \ $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ qcopchannel_qws.h qwindowsystem_qws.h \ qfontmanager_qws.h qwsdefaultdecoration_qws.h)) touch $@ $(QTDIR)/stamp-headers-x11 : @-rm -f $(QTDIR)/stamp-headers* 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) touch $@ $(OPIEDIR)/stamp-headers : @-rm -f $(OPIEDIR)/stamp-headers* mkdir -p $(TOPDIR)/include/qpe \ - $(TOPDIR)/include/qtopia \ - $(TOPDIR)/include/opie \ - $(TOPDIR)/include/opie2 \ - $(TOPDIR)/include/qtopia/private + $(TOPDIR)/include/qtopia \ + $(TOPDIR)/include/opie \ + $(TOPDIR)/include/opie2 \ + $(TOPDIR)/include/qtopia/private ( 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 .; ) + ( 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 touch $@ - + $(OPIEDIR)/stamp-headers-x11 : @-rm -f $(OPIEDIR)/stamp-headers* mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private ( 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 .; ) ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) ( cd include/opie && ln -sf ../../libsql/*.h .; ) ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) ( 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 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) touch $@ - + $(TOPDIR)/library/custom.h : $(TOPDIR)/.config @-rm -f $@ @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) @touch $@ $(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: @$(call descend,$(shell dirname $@),$(shell basename $@)) menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in $(TOPDIR)/scripts/kconfig/mconf ./config.in @touch ./.config.stamp xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in $(TOPDIR)/scripts/kconfig/qconf ./config.in @touch .config.stamp gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in $(TOPDIR)/scripts/kconfig/gconf ./config.in @touch .config.stamp config: $(TOPDIR)/scripts/kconfig/conf ./config.in $(TOPDIR)/scripts/kconfig/conf ./config.in @touch .config.stamp oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in $(TOPDIR)/scripts/kconfig/conf -o ./config.in @touch .config.stamp randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in $(TOPDIR)/scripts/kconfig/conf -r ./config.in @touch .config.stamp allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in $(TOPDIR)/scripts/kconfig/conf -y ./config.in @touch .config.stamp allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in $(TOPDIR)/scripts/kconfig/conf -n ./config.in @touch .config.stamp defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in $(TOPDIR)/scripts/kconfig/conf -d ./config.in @touch .config.stamp $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default $(TOPDIR)/mkspecs/default : ln -sf linux-g++ $@ $(TOPDIR)/scripts/subst : force @( \ echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ ) > $@ || ( rm -f $@; exit 1 ) $(TOPDIR)/scripts/filesubst : force @( \ echo 's,\$$OPIEDIR/root/,/,g'; \ echo 's,$(OPIEDIR)/root/,/,g'; \ echo 's,\$$OPIEDIR,$(prefix),g'; \ echo 's,$(OPIEDIR),$(prefix),g'; \ echo 's,\$$QTDIR,$(prefix),g'; \ echo 's,$(QTDIR),$(prefix),g'; \ echo 's,^\(\./\)*root/,/,g'; \ echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ ) > $@ || ( rm -f $@; exit 1 ) ## general rules ## define descend $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) endef define makefilegen cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\` " | \ head -1 | awk '{print $$3}'` endef define makecfg $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) endef 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 @@ -1,11 +1,11 @@ Package: libopiecore2 Files: $OPIEDIR/lib/libopiecore2.so.* 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 @@ -1,55 +1,38 @@ TEMPLATE = lib CONFIG += qt warn_on debug 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 \ oprocctrl.h \ ostorageinfo.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 include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } 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 @@ -1,11 +1,11 @@ Package: libopieui2 Files: $OPIEDIR/lib/libopieui2.so.* 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 @@ -1,69 +1,64 @@ TEMPLATE = lib CONFIG += qt warn_on debug 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 \ opixmapeffect.h \ opopupmenu.h \ opixmapprovider.h \ oselector.h \ otabinfo.h \ otabbar.h \ otabwidget.h \ otimepicker.h \ oversatileview.h \ oversatileviewitem.h \ omessagebox.h \ oresource.h \ otaskbarapplet.h \ oseparator.h SOURCES = ocheckitem.cpp \ oclickablelabel.cpp \ - ofileselector.cpp \ - ofiledialog.cpp \ ofontselector.cpp \ oimageeffect.cpp \ olistview.cpp \ opixmapeffect.cpp \ opopupmenu.cpp \ opixmapprovider.cpp \ oselector.cpp \ otabbar.cpp \ otabwidget.cpp \ otimepicker.cpp \ oversatileview.cpp \ oversatileviewitem.cpp \ odialog.cpp \ oresource.cpp \ otaskbarapplet.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 LIBS += -lopiecore2 !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } |