author | wimpie <wimpie> | 2005-01-09 03:02:21 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-09 03:02:21 (UTC) |
commit | 67d1d0b292553af550219d770cbd5c00987d8b8b (patch) (unidiff) | |
tree | 517759c7fbda44a40ff733e3b5d5667d90558caa /Rules.make | |
parent | 987bc9a2c5b39ddd4dc2a665cea65688bfd2179e (diff) | |
download | opie-67d1d0b292553af550219d770cbd5c00987d8b8b.zip opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.gz opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.bz2 |
CONTROL files : reset version to 'standard' format
(partly rolls back my drastic
all-applicatoins-same-version change)
now format is x.y(.z)$EXTRAVERSION
where x.y (and aptionally .z)
are x : major version
y : minor version
z : application patch
and extra version is seconds-since-epoch
this value can be used to automatically
upgrade versions with minor changes (without
manual update of the control file)
-rw-r--r-- | Rules.make | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,38 +1,42 @@ | |||
1 | .phony: force | 1 | .phony: force |
2 | force: | 2 | force: |
3 | 3 | ||
4 | $(configs) : | 4 | $(configs) : |
5 | $(call makecfg,$@) | 5 | $(call makecfg,$@) |
6 | 6 | ||
7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | 7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
8 | echo > $@ | 8 | echo > $@ |
9 | # added for threaded version | 9 | # added for threaded version |
10 | ifneq ($(CONFIG_THREADED),) | 10 | ifneq ($(CONFIG_THREADED),) |
11 | echo CONFIG += thread >> $@ | 11 | echo CONFIG += thread >> $@ |
12 | else | 12 | else |
13 | echo CONFIG -= thread >> $@ | 13 | echo CONFIG -= thread >> $@ |
14 | endif | 14 | endif |
15 | # added for auto stripped build | ||
16 | ifneq ($(CONFIG_STRIP),) | ||
17 | echo CONFIG += strip >> $@ | ||
18 | endif | ||
15 | ifneq ($(CONFIG_DEBUG),) | 19 | ifneq ($(CONFIG_DEBUG),) |
16 | echo CONFIG += debug >> $@ | 20 | echo CONFIG += debug >> $@ |
17 | echo CONFIG -= release >> $@ | 21 | echo CONFIG -= release >> $@ |
18 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ | 22 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ |
19 | echo DEFINES += QT_DEBUG >> $@ | 23 | echo DEFINES += QT_DEBUG >> $@ |
20 | else | 24 | else |
21 | echo CONFIG -= debug >> $@ | 25 | echo CONFIG -= debug >> $@ |
22 | echo CONFIG += release >> $@ | 26 | echo CONFIG += release >> $@ |
23 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ | 27 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ |
24 | endif | 28 | endif |
25 | ifeq ($(CONFIG_STATIC),y) | 29 | ifeq ($(CONFIG_STATIC),y) |
26 | echo !contains\( TARGET,qpe \) \{ >> $@ | 30 | echo !contains\( TARGET,qpe \) \{ >> $@ |
27 | echo CONFIG += staticlib >> $@ | 31 | echo CONFIG += staticlib >> $@ |
28 | echo \} >> $@ | 32 | echo \} >> $@ |
29 | endif | 33 | endif |
30 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 | 34 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
31 | echo CONFIG -= qt3 >> $@ | 35 | echo CONFIG -= qt3 >> $@ |
32 | else | 36 | else |
33 | echo CONFIG += qt3 >> $@ | 37 | echo CONFIG += qt3 >> $@ |
34 | endif | 38 | endif |
35 | ifneq ($(CONFIG_QUICK_LAUNCH),) | 39 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
36 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 40 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
37 | echo CONFIG -= staticlib >> $@ | 41 | echo CONFIG -= staticlib >> $@ |
38 | echo CONFIG -= quick-app >> $@ | 42 | echo CONFIG -= quick-app >> $@ |
@@ -86,48 +90,52 @@ endif | |||
86 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ | 90 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ |
87 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) | 91 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) |
88 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ | 92 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ |
89 | endif | 93 | endif |
90 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) | 94 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) |
91 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ | 95 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ |
92 | endif | 96 | endif |
93 | # Write LIB dirs and INC dirs... | 97 | # Write LIB dirs and INC dirs... |
94 | ifeq ($(CONFIG_LIBETPAN_DEP),y) | 98 | ifeq ($(CONFIG_LIBETPAN_DEP),y) |
95 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ | 99 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ |
96 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ | 100 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ |
97 | endif | 101 | endif |
98 | ifeq ($(CONFIG_LIBPCAP_DEP),y) | 102 | ifeq ($(CONFIG_LIBPCAP_DEP),y) |
99 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ | 103 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ |
100 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ | 104 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ |
101 | endif | 105 | endif |
102 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) | 106 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) |
103 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ | 107 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ |
104 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ | 108 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ |
105 | endif | 109 | endif |
106 | ifeq ($(CONFIG_LIBXINE_DEP),y) | 110 | ifeq ($(CONFIG_LIBXINE_DEP),y) |
107 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ | 111 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ |
108 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ | 112 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ |
109 | endif | 113 | endif |
114 | ifeq ($(CONFIG_LIBBLUEZ_DEP),y) | ||
115 | echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ | ||
116 | echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ | ||
117 | endif | ||
110 | ifeq ($(CONFIG_LIBIPK_DEP),y) | 118 | ifeq ($(CONFIG_LIBIPK_DEP),y) |
111 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ | 119 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ |
112 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ | 120 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ |
113 | endif | 121 | endif |
114 | ifeq ($(CONFIG_LIBSDK_DEP),y) | 122 | ifeq ($(CONFIG_LIBSDK_DEP),y) |
115 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ | 123 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ |
116 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ | 124 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ |
117 | endif | 125 | endif |
118 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | 126 | ifeq ($(CONFIG_LIBSWORD_DEP),y) |
119 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | 127 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ |
120 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | 128 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ |
121 | endif | 129 | endif |
122 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 130 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
123 | @echo Generating dependency information... | 131 | @echo Generating dependency information... |
124 | # add to subdir-y, and add descend rules | 132 | # add to subdir-y, and add descend rules |
125 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 133 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
126 | awk '{print \ | 134 | awk '{print \ |
127 | ".PHONY : " $$2 "\n" \ | 135 | ".PHONY : " $$2 "\n" \ |
128 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ | 136 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
129 | print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends | 137 | print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
130 | cat $(TOPDIR)/packages | grep -v '^#' | \ | 138 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
131 | 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"; }' \ | 139 | 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"; }' \ |
132 | >> $(TOPDIR)/.depends | 140 | >> $(TOPDIR)/.depends |
133 | # interpackage dependency generation | 141 | # interpackage dependency generation |