summaryrefslogtreecommitdiff
authorar <ar>2005-03-26 00:06:00 (UTC)
committer ar <ar>2005-03-26 00:06:00 (UTC)
commit6d8f326cb4429a45c417ecdc04f58e832017aa66 (patch) (unidiff)
treeb14ca8057b4019e7704d92341475130bf2b11d38
parentbd86e7f6e4212f527d5b88af03acf23875470054 (diff)
downloadopie-6d8f326cb4429a45c417ecdc04f58e832017aa66.zip
opie-6d8f326cb4429a45c417ecdc04f58e832017aa66.tar.gz
opie-6d8f326cb4429a45c417ecdc04f58e832017aa66.tar.bz2
- cleanup qmake in mrproper target
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3a6c18d..a6768a7 100644
--- a/Makefile
+++ b/Makefile
@@ -88,64 +88,66 @@ export include-config := 1
88endif 88endif
89 89
90-include $(TOPDIR)/.config.cmd 90-include $(TOPDIR)/.config.cmd
91 91
92SUBDIRS = $(subdir-y) 92SUBDIRS = $(subdir-y)
93 93
94all clean install ipk: $(SUBDIRS) 94all clean install ipk: $(SUBDIRS)
95 95
96lupdate lrelease: 96lupdate lrelease:
97 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done 97 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
98 98
99opie-lupdate opie-lrelease messages: 99opie-lupdate opie-lrelease messages:
100 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; 100 @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
101 101
102# from kde 102# from kde
103qtmessages: 103qtmessages:
104 cd $(QTDIR)/src ; \ 104 cd $(QTDIR)/src ; \
105 sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\ 105 sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\
106 find . -name "*.cpp" | grep -v moc_ > list ;\ 106 find . -name "*.cpp" | grep -v moc_ > list ;\
107 for file in qfiledialog qcolordialog qprintdialog \ 107 for file in qfiledialog qcolordialog qprintdialog \
108 qurloperator qftp qhttp qlocal qerrormessage; do \ 108 qurloperator qftp qhttp qlocal qerrormessage; do \
109 grep -v $$file list > list.new && mv list.new list ;\ 109 grep -v $$file list > list.new && mv list.new list ;\
110 done ;\ 110 done ;\
111 xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot 111 xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot
112 112
113ifndef CONFIG_TARGET_OE 113ifndef CONFIG_TARGET_OE
114$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ 114$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
115 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ 115 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
116 $(TOPDIR)/library/custom.h 116 $(TOPDIR)/library/custom.h
117else 117else
118$(subdir-y) : $(if $(CONFIG_LIBQPE),$(OPIEDIR)/stamp-headers) $(TOPDIR)/library/custom.h 118$(subdir-y) : $(if $(CONFIG_LIBQPE),$(OPIEDIR)/stamp-headers) $(TOPDIR)/library/custom.h
119endif 119endif
120 120
121clean : $(TOPDIR)/.config 121clean : $(TOPDIR)/.config
122 make -C bin clean 122 make -C bin clean
123 make -C lib clean 123 make -C lib clean
124 make -C plugins clean 124 make -C plugins clean
125 125
126apidox : 126apidox :
127 doc/generate_apidox 127 doc/generate_apidox
128 128
129mrproper : clean-configs 129mrproper : clean-configs
130 find . -name ".moc"|xargs rm -rf 130 find . -name ".moc"|xargs rm -rf
131 find . -name ".obj"|xargs rm -rf 131 find . -name ".obj"|xargs rm -rf
132 find lib -name "lib*.*"|xargs rm -f 132 find lib -name "lib*.*"|xargs rm -f
133 find plugins -name "lib*.*"|xargs rm -f 133 find plugins -name "lib*.*"|xargs rm -f
134 find . -name "*.pro"|xargs touch 134 find . -name "*.pro"|xargs touch
135 rm stamp-headers 135 rm stamp-headers
136 make -C qmake clean
137 rm qmake/qmake
136 138
137include $(TOPDIR)/Rules.make 139include $(TOPDIR)/Rules.make
138 140
139# to speed up (avoid include/generation of packaging rules) 141# to speed up (avoid include/generation of packaging rules)
140ifneq ($(filter package%,$(MAKECMDGOALS)),) 142ifneq ($(filter package%,$(MAKECMDGOALS)),)
141 143
142# packaging requested 144# packaging requested
143 145
144$(TOPDIR)/Package.make : 146$(TOPDIR)/Package.make :
145 @echo "Generating packaging rules" 147 @echo "Generating packaging rules"
146 @$(TOPDIR)/scripts/GeneratePackageMake > $(TOPDIR)/Package.make 148 @$(TOPDIR)/scripts/GeneratePackageMake > $(TOPDIR)/Package.make
147 149
148# load rules to make packages 150# load rules to make packages
149-include $(TOPDIR)/Package.make 151-include $(TOPDIR)/Package.make
150 152
151endif 153endif