summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test4
-rw-r--r--Rules.make8
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.test b/Makefile.test
index 7befb39..15cd128 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -100,10 +100,10 @@ export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
100endif 100endif
101 101
102all clean: $(subdir-y) 102all clean: $(subdir-y)
103 103
104$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ 104$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
105 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ 105 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
106 $(TOPDIR)/library/custom.h 106 $(TOPDIR)/library/custom.h
107 107
108clean : $(TOPDIR)/.config 108clean : $(TOPDIR)/.config
109 109
diff --git a/Rules.make b/Rules.make
index 817c2bc..92286c6 100644
--- a/Rules.make
+++ b/Rules.make
@@ -23,10 +23,10 @@ $(TOPDIR)/.depends.cfgs:
23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
24 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 24 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
25 @-rm -f dirs 25 @-rm -f dirs
26 26
27$(TOPDIR)/stamp-headers : 27$(QTDIR)/stamp-headers :
28 @-rm -f $(TOPDIR)/stamp-headers* 28 @-rm -f $@*
29 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 29 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
30 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 30 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
31 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 31 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
32 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 32 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
@@ -42,10 +42,10 @@ $(TOPDIR)/stamp-headers :
42 qcopchannel_qws.h qwindowsystem_qws.h \ 42 qcopchannel_qws.h qwindowsystem_qws.h \
43 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 43 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
44 touch $@ 44 touch $@
45 45
46$(TOPDIR)/stamp-headers-x11 : 46$(QTDIR)/stamp-headers-x11 :
47 @-rm -f $(TOPDIR)/stamp-headers* 47 @-rm -f $@*
48 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 48 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
49 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 49 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
50 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 50 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
51 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 51 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )