| author | zecke <zecke> | 2003-08-27 12:24:03 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2003-08-27 12:24:03 (UTC) |
| commit | 6a6af694205eb9a55b18eb10f2290a9747019388 (patch) (side-by-side diff) | |
| tree | e930a44ea8b32720a9611bbfd59a71b83bb7e606 | |
| parent | 151c319a9a67ae420136fb23cc987d23059737f6 (diff) | |
| download | opie-6a6af694205eb9a55b18eb10f2290a9747019388.zip opie-6a6af694205eb9a55b18eb10f2290a9747019388.tar.gz opie-6a6af694205eb9a55b18eb10f2290a9747019388.tar.bz2 | |
If you add quick-app to the CONFIG options
it'll use the global quick app setting to either
be a lib or normal executable
| -rw-r--r-- | Rules.make | 11 | ||||
| -rw-r--r-- | config.in | 4 | ||||
| -rw-r--r-- | include.pro | 18 |
3 files changed, 32 insertions, 1 deletions
@@ -13,16 +13,27 @@ 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 \} >> $@ +else + echo contains\( CONFIG, quick-app \) \{ >> $@ + echo CONFIG -= quick-app >> $@ + echo CONFIG += quick-app-bin >> $@ + echo \} >> $@ +endif $(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"; \ @@ -32,16 +32,20 @@ config OPTIMIZE 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 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) diff --git a/include.pro b/include.pro index 3ba8776..c70c4d5 100644 --- a/include.pro +++ b/include.pro @@ -1,13 +1,28 @@ +include ( $(OPIEDIR)/gen.pro ) + # make install # base opie install path prefix = /opt/QtPalmtop + +contains( CONFIG, quick-app-lib ) { + TEMPLATE = lib + DESTDIR = $(OPIEDIR)/plugins/applications + DEFINES += OPIE_APP_INTERFACE +} +contains ( CONFIG, quick-app-bin ) { + TEMPLATE = app + DESTDIR = $(OPIEDIR)/bin + DEFINES -= OPIE_APP_INTERFACE +} + + contains( TEMPLATE, lib ) { target.path = $$prefix/lib } !contains( TEMPLATE, lib ) { target.path = $$prefix/bin } INSTALLS += target @@ -72,9 +87,10 @@ ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_RO QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib QMAKE_LIBDIR += $(OPIEDIR)/lib MOC_DIR=.moc/$(PLATFORM) OBJECTS_DIR=.obj/$(PLATFORM) -include ( $(OPIEDIR)/gen.pro ) +#was here now at thetop +#include ( $(OPIEDIR)/gen.pro ) |