summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -98,23 +98,28 @@ endif
98-include $(TOPDIR)/.config.cmd 98-include $(TOPDIR)/.config.cmd
99 99
100SUBDIRS = $(subdir-y) 100SUBDIRS = $(subdir-y)
101 101
102export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 102export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
103 103
104ifdef CONFIG_OPTIMIZATIONS 104ifdef CONFIG_OPTIMIZATIONS
105export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 105export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
106export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 106export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
107endif 107endif
108 108
109all clean install ipk: $(SUBDIRS) 109all clean install ipk: $(SUBDIRS)
110 110
111lupdate lrelease: 111lupdate lrelease:
112 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; 112 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
113 113
114opie-lupdate opie-lrelease:
115 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
116
114$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ 117$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
115 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ 118 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
116 $(TOPDIR)/library/custom.h 119 $(TOPDIR)/library/custom.h
117 120
118clean : $(TOPDIR)/.config 121clean : $(TOPDIR)/.config
119 122
123apidox : doc/generate_apidox
124
120include $(TOPDIR)/Rules.make 125include $(TOPDIR)/Rules.make
diff --git a/include.pro b/include.pro
index 4f1144f..8503aa0 100644
--- a/include.pro
+++ b/include.pro
@@ -42,31 +42,36 @@ INSTALLS += etc
42 42
43apps.path = $$prefix/apps/ 43apps.path = $$prefix/apps/
44apps.files = apps/* 44apps.files = apps/*
45INSTALLS += apps 45INSTALLS += apps
46 46
47# sounds, default path is $$prefix/sounds/$$TARGET 47# sounds, default path is $$prefix/sounds/$$TARGET
48sounds.path = $$prefix/sounds/$$TARGET 48sounds.path = $$prefix/sounds/$$TARGET
49sounds.files = sounds/* 49sounds.files = sounds/*
50INSTALLS += sounds 50INSTALLS += sounds
51 51
52# anything in nonstandard paths 52# anything in nonstandard paths
53root.path = / 53root.path = /
54root.files = root/* 54root.files = root/*
55INSTALLS += root 55INSTALLS += root
56 56
57# new targets 57# new targets
58opie-lupdate.target = opie-lupdate
59opie-lupdate.commands = opie-lupdate -noobsolete $(PRO)
60
61opie-lrelease.target = opie-lrelease
62opie-lrelease.commands = opie-lrelease $(PRO)
58 63
59lupdate.target = lupdate 64lupdate.target = lupdate
60lupdate.commands = lupdate -noobsolete $(PRO) 65lupdate.commands = lupdate -noobsolete $(PRO)
61 66
62lrelease.target = lrelease 67lrelease.target = lrelease
63lrelease.commands = lrelease $(PRO) 68lrelease.commands = lrelease $(PRO)
64 69
65ipk.target = ipk 70ipk.target = ipk
66ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
67 72
68QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk 73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
69QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
70QMAKE_LIBDIR += $(OPIEDIR)/lib 75QMAKE_LIBDIR += $(OPIEDIR)/lib
71 76
72include ( $(OPIEDIR)/gen.pro ) 77include ( $(OPIEDIR)/gen.pro )