author | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
commit | 102a00422a155cef204977f6bb7b3f530b7b8c19 (patch) (unidiff) | |
tree | c4add67d773b27cad52c719cc032431cb687c3f9 /Rules.make | |
parent | 3a53173f75c21417bf7601b60a791f72fbb4631d (diff) | |
download | opie-102a00422a155cef204977f6bb7b3f530b7b8c19.zip opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.gz opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.bz2 |
Merges.
-rw-r--r-- | Rules.make | 54 |
1 files changed, 46 insertions, 8 deletions
@@ -1,2 +1,3 @@ | |||
1 | .PHONY: FORCE | 1 | .phony: force |
2 | force: | ||
2 | 3 | ||
@@ -59,4 +60,3 @@ $(OPIEDIR)/stamp-headers : | |||
59 | $(TOPDIR)/include/opie \ | 60 | $(TOPDIR)/include/opie \ |
60 | $(TOPDIR)/include/qtopia/private \ | 61 | $(TOPDIR)/include/qtopia/private |
61 | $(TOPDIR)/include/opie2 | ||
62 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 62 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
@@ -65,3 +65,2 @@ $(OPIEDIR)/stamp-headers : | |||
65 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 65 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
66 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | ||
67 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 66 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
@@ -100,4 +99,40 @@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config | |||
100 | 99 | ||
101 | $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake : | 100 | $(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: |
102 | $(call descend,$(shell dirname $@),$(shell basename $@)) | 101 | @$(call descend,$(shell dirname $@),$(shell basename $@)) |
102 | |||
103 | menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in | ||
104 | $(TOPDIR)/scripts/kconfig/mconf ./config.in | ||
105 | @touch ./.config.stamp | ||
106 | |||
107 | xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in | ||
108 | $(TOPDIR)/scripts/kconfig/qconf ./config.in | ||
109 | @touch .config.stamp | ||
110 | |||
111 | gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in | ||
112 | $(TOPDIR)/scripts/kconfig/gconf ./config.in | ||
113 | @touch .config.stamp | ||
114 | |||
115 | config: $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
116 | $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
117 | @touch .config.stamp | ||
118 | |||
119 | oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
120 | $(TOPDIR)/scripts/kconfig/conf -o ./config.in | ||
121 | @touch .config.stamp | ||
122 | |||
123 | randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
124 | $(TOPDIR)/scripts/kconfig/conf -r ./config.in | ||
125 | @touch .config.stamp | ||
126 | |||
127 | allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
128 | $(TOPDIR)/scripts/kconfig/conf -y ./config.in | ||
129 | @touch .config.stamp | ||
130 | |||
131 | allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
132 | $(TOPDIR)/scripts/kconfig/conf -n ./config.in | ||
133 | @touch .config.stamp | ||
134 | |||
135 | defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | ||
136 | $(TOPDIR)/scripts/kconfig/conf -d ./config.in | ||
137 | @touch .config.stamp | ||
103 | 138 | ||
@@ -108,3 +143,3 @@ $(TOPDIR)/mkspecs/default : | |||
108 | 143 | ||
109 | $(TOPDIR)/scripts/subst : FORCE | 144 | $(TOPDIR)/scripts/subst : force |
110 | @( \ | 145 | @( \ |
@@ -115,2 +150,3 @@ $(TOPDIR)/scripts/subst : FORCE | |||
115 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ | 150 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ |
151 | echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ | ||
116 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ | 152 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ |
@@ -118,3 +154,3 @@ $(TOPDIR)/scripts/subst : FORCE | |||
118 | 154 | ||
119 | $(TOPDIR)/scripts/filesubst : FORCE | 155 | $(TOPDIR)/scripts/filesubst : force |
120 | @( \ | 156 | @( \ |
@@ -136,2 +172,4 @@ $(TOPDIR)/scripts/filesubst : FORCE | |||
136 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ | 172 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ |
173 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ | ||
174 | echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ | ||
137 | ) > $@ || ( rm -f $@; exit 1 ) | 175 | ) > $@ || ( rm -f $@; exit 1 ) |