author | kergoth <kergoth> | 2003-01-28 18:59:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-28 18:59:21 (UTC) |
commit | b32cd6fb7b80589c1ecfa93eaa43ca91f7a6b2bd (patch) (unidiff) | |
tree | 6daf397af3654157b6c8729aab01ea53d11f95e6 | |
parent | 0bbf9cc78e46de9e116f6b4f8de2b736759f8c15 (diff) | |
download | opie-b32cd6fb7b80589c1ecfa93eaa43ca91f7a6b2bd.zip opie-b32cd6fb7b80589c1ecfa93eaa43ca91f7a6b2bd.tar.gz opie-b32cd6fb7b80589c1ecfa93eaa43ca91f7a6b2bd.tar.bz2 |
bugfix re: switching between x11 and normal builds.. stamp-header cleanup.
-rw-r--r-- | Rules.make | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -30,45 +30,45 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) | |||
30 | 30 | ||
31 | $(TOPDIR)/.depends.cfgs: | 31 | $(TOPDIR)/.depends.cfgs: |
32 | # config.in interdependencies | 32 | # config.in interdependencies |
33 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs | 33 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs |
34 | @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 ) >> $@ | 34 | @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 ) >> $@ |
35 | @-rm -f dirs | 35 | @-rm -f dirs |
36 | 36 | ||
37 | $(QTDIR)/stamp-headers : | 37 | $(QTDIR)/stamp-headers : |
38 | @-rm -f $@* | 38 | @-rm -f $(QTDIR)/stamp-headers* |
39 | ( cd $(QTDIR)/include; \ | 39 | ( cd $(QTDIR)/include; \ |
40 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ | 40 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
41 | qcopchannel_qws.h qwindowsystem_qws.h \ | 41 | qcopchannel_qws.h qwindowsystem_qws.h \ |
42 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) | 42 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
43 | touch $@ | 43 | touch $@ |
44 | 44 | ||
45 | $(QTDIR)/stamp-headers-x11 : | 45 | $(QTDIR)/stamp-headers-x11 : |
46 | @-rm -f $@* | 46 | @-rm -f $(QTDIR)/stamp-headers* |
47 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) | 47 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) |
48 | touch $@ | 48 | touch $@ |
49 | 49 | ||
50 | $(OPIEDIR)/stamp-headers : | 50 | $(OPIEDIR)/stamp-headers : |
51 | @-rm -f $@* | 51 | @-rm -f $(OPIEDIR)/stamp-headers* |
52 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 52 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
53 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 53 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
54 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 54 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
55 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 55 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
56 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 56 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
57 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 57 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
58 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 58 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
59 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 59 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
60 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 60 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
61 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 61 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
62 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 62 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
63 | touch $@ | 63 | touch $@ |
64 | 64 | ||
65 | $(OPIEDIR)/stamp-headers-x11 : | 65 | $(OPIEDIR)/stamp-headers-x11 : |
66 | @-rm -f $@* | 66 | @-rm -f $(OPIEDIR)/stamp-headers* |
67 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 67 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
68 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 68 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
69 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 69 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
70 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 70 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
71 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 71 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
72 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 72 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
73 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 73 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
74 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 74 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |