summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
committer mickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
commit22e51ed82162ef307f3f8cef21d3288147f18cad (patch) (side-by-side diff)
treed3318a78deb837c91aca6d048ad649716060a5a3
parent969831e80dd285e8c95e8a91333a626717d5543e (diff)
downloadopie-22e51ed82162ef307f3f8cef21d3288147f18cad.zip
opie-22e51ed82162ef307f3f8cef21d3288147f18cad.tar.gz
opie-22e51ed82162ef307f3f8cef21d3288147f18cad.tar.bz2
support a customizable quicklaunch path, this fixes the problem when
people install quicklaunch applications to non-root hence having the link pointing to non-existing ./quicklauncher
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--config.in4
2 files changed, 5 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index 82c71e1..31a1b66 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,216 +1,217 @@
.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
( 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 ../../libopie/pim/*.h .; )
( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.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; 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
diff --git a/config.in b/config.in
index 166332a..e93eac8 100644
--- a/config.in
+++ b/config.in
@@ -1,242 +1,246 @@
mainmenu "Opie Configuration"
menu "Build Parameters"
choice
prompt "Target Machine"
default TARGET_X86
help
Please select the architecture of the machine you will be
building the OpenZaurus buildroot for.
config TARGET_X86
boolean "Intel X86"
config TARGET_MACOSX
boolean "Mac OS X (DARWIN)"
config TARGET_SHARP
boolean "Sharp Zaurus"
config TARGET_IPAQ
boolean "iPAQ"
config TARGET_RAMSES
boolean "Ramses"
config TARGET_SIMPAD
boolean "SIMpad"
config TARGET_YOPY
boolean "Yopy 3500/3700"
endchoice
config OPTIMIZE
boolean "Use optimizations"
default "y" if ! TARGET_X86
config DEBUG
boolean "Enable debug builds"
default n
config RELEASE
bool
default y
depends !DEBUG
config QUICK_LAUNCH
boolean "Enable Quick Launch"
default n
+config QUICKLAUNCH_PATH
+ string "Path to quicklauncher"
+ default "./quicklauncher" if TARGET_X86
+ default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
config SPECFILE
string
default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
default "linux-g++" if TARGET_X86 && X11
default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
default "linux-g++" if TARGET_SHARP && X11
default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
default "linux-g++" if TARGET_IPAQ && X11
default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
default "linux-g++" if TARGET_RAMSES && X11
default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
default "linux-g++" if TARGET_SIMPAD && X11
default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
config CUSTOMFILE
string
default "custom-ipaq.h" if TARGET_IPAQ
default "custom-sharp.h" if TARGET_SHARP
default "custom-ramses.h" if TARGET_RAMSES
default "custom-ipaq.h" if TARGET_SIMPAD
default "custom-yopy.h" if TARGET_YOPY
config OPTIMIZATIONS
string "Optimization flags"
depends OPTIMIZE
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
config EXPERIMENTAL
bool "Prompt for development and/or incomplete items"
default y
endmenu
menu "Opie Compile Configs"
config OPIE_NO_OVERRIDE_QT
boolean "Build Opie against an unpatched version of Qt"
default n
config OPIE_NO_BUILTIN_SHUTDOWN
boolean "Disable the built in shutdown application"
default n
config OPIE_NO_BUILTIN_CALIBRATE
boolean "Disable the built in calibrate application"
default y if TARGET_YOPY
default n
config OPIE_SOUND_FRAGMENT_SHIFT
string "The sound fragment used in Opie Player I"
default "14" if TARGET_IPAQ
default "16" if (!TARGET_IPAQ)
config USE_REALTIME_AUDIO_THREAD
boolean "Use a realtime thread in Opie Player I"
default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
default n
config QT_QWS_ALLOW_OVERCLOCK
boolean "Allow the user to overclock the device"
depends TARGET_RAMSES
default n
config OPIE_HIGH_RES_SMALL_PHY
boolean "Resolution is bigger than physical scrren"
default y if TARGET_C700
default n
config OPIE_NEW_ALLOC
boolean "Use malloc and free for the implementation"
default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
default n
config OPIE_NO_SOUND_PCM_READ_BITS
boolean "there is not a pcm_read_bits io control"
default y if TARGET_SHARP
default n
endmenu
menu "Base"
choice
prompt "Qpe Library Selection"
default LIBQPE
source library/config.in
source x11/config.in
endchoice
source libopie/config.in
source core/opie-login/config.in
source core/opiealarm/config.in
source core/tools/quicklauncher/config.in
source core/launcher/config.in
source core/qws/config.in
endmenu
comment ""
menu "Applets"
source core/applets/config.in
source noncore/applets/config.in
endmenu
menu "Apps"
source core/apps/config.in
source noncore/apps/config.in
endmenu
menu "Communications and Networking"
source noncore/comm/config.in
source noncore/net/config.in
endmenu
menu "Games"
source noncore/games/config.in
endmenu
menu "Graphics and Multimedia"
source freetype/config.in
source noncore/graphics/config.in
source core/multimedia/config.in
source noncore/multimedia/config.in
endmenu
menu "Input methods"
source inputmethods/config.in
endmenu
menu "Pim"
source core/pim/config.in
menu "Today Plugins"
source noncore/todayplugins/config.in
source core/pim/today/plugins/config.in
endmenu
endmenu
menu "Settings"
source core/settings/config.in
source noncore/settings/config.in
endmenu
menu "Theming"
source noncore/decorations/config.in
source noncore/styles/config.in
endmenu
menu "Tools"
source noncore/tools/config.in
endmenu
menu "Development"
source development/keyview/config.in
#source development/debugviewer/config.in
endmenu
menu "Examples"
config EXAMPLES
boolean "Compile Example Application"
source examples/config.in
endmenu
comment ""
menu "Unsupported / Unmaintained"
source noncore/unsupported/config.in
endmenu
comment ""
depends on EXPERIMENTAL
menu "Experimental"
depends on EXPERIMENTAL
source libopie2/config.in
config SQL_PIM_BACKEND
bool "Add SQL-Backend support (experimental)"
default n
help
This adds the SQL-Support, using SQLite. Which database is used
by the backends is defined by the file "pimaccess.conf" in the
directory "Settings".
There currently do exist to groups "[contact]" and "[todo]". You can
select the used backend by the variable "usebackend=<type>", where
<type> is "sql" or "xml". "xml" is the default !
Important: The SQLite-library "libsqlite.so" must be installed !
depends ( LIBOPIE2DB )
comment "SQL-Support needs libopie2db!"