summaryrefslogtreecommitdiff
authorzecke <zecke>2003-04-20 18:11:17 (UTC)
committer zecke <zecke>2003-04-20 18:11:17 (UTC)
commitca3cd49d65353584bfe85755ef2885b049d25d33 (patch) (side-by-side diff)
tree4a6cf7ec233e2531e76dd191ea2e65da66eb9460
parent606f5d9cd2ecba4df175bc722621e4e4df3bc516 (diff)
downloadopie-ca3cd49d65353584bfe85755ef2885b049d25d33.zip
opie-ca3cd49d65353584bfe85755ef2885b049d25d33.tar.gz
opie-ca3cd49d65353584bfe85755ef2885b049d25d33.tar.bz2
Add opie-lupdate and opie-lrelease as targets
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile5
-rw-r--r--include.pro7
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 52894ce..9169645 100644
--- a/Makefile
+++ b/Makefile
@@ -82,39 +82,44 @@ allnoconfig :
defconfig :
$(call descend,scripts/kconfig,conf)
./scripts/kconfig/conf -d ./config.in
export
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
export include-config := 1
-include $(TOPDIR)/.config
-include $(TOPDIR)/.depends
endif
-include $(TOPDIR)/.config.cmd
SUBDIRS = $(subdir-y)
export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
ifdef CONFIG_OPTIMIZATIONS
export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
endif
all clean install ipk: $(SUBDIRS)
lupdate lrelease:
@for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
+opie-lupdate opie-lrelease:
+ @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
+
$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
$(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
$(TOPDIR)/library/custom.h
clean : $(TOPDIR)/.config
+apidox : doc/generate_apidox
+
include $(TOPDIR)/Rules.make
diff --git a/include.pro b/include.pro
index 4f1144f..8503aa0 100644
--- a/include.pro
+++ b/include.pro
@@ -26,47 +26,52 @@ sounds.path = $$prefix/sounds/$$TARGET
sounds.files = sounds/*
INSTALLS += sounds
# init scripts, default path is /etc/init.d
init.path = /etc/init.d
init.files = init.d/*
INSTALLS += init
# data, default path is /usr/share/$$TARGET
data.path = /usr/share/$$TARGET
data.files = share/*
INSTALLS += data
etc.path = $$prefix/etc/
etc.files = etc/*
INSTALLS += etc
apps.path = $$prefix/apps/
apps.files = apps/*
INSTALLS += apps
# sounds, default path is $$prefix/sounds/$$TARGET
sounds.path = $$prefix/sounds/$$TARGET
sounds.files = sounds/*
INSTALLS += sounds
# anything in nonstandard paths
root.path = /
root.files = root/*
INSTALLS += root
# new targets
+opie-lupdate.target = opie-lupdate
+opie-lupdate.commands = opie-lupdate -noobsolete $(PRO)
+
+opie-lrelease.target = opie-lrelease
+opie-lrelease.commands = opie-lrelease $(PRO)
lupdate.target = lupdate
lupdate.commands = lupdate -noobsolete $(PRO)
lrelease.target = lrelease
lrelease.commands = lrelease $(PRO)
ipk.target = ipk
ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
-QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk
+QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
QMAKE_LIBDIR += $(OPIEDIR)/lib
include ( $(OPIEDIR)/gen.pro )