summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 18:52:05 (UTC)
committer kergoth <kergoth>2003-01-16 18:52:05 (UTC)
commita7f1a060dc863d682c9ae0f684dc3607d68f6040 (patch) (unidiff)
tree5d2d4a44e31a706c28cfda9d01fbd411004f0f8a
parent0d4f9c31c5d86e4a2667719fd7d1cba26b00d263 (diff)
downloadopie-a7f1a060dc863d682c9ae0f684dc3607d68f6040.zip
opie-a7f1a060dc863d682c9ae0f684dc3607d68f6040.tar.gz
opie-a7f1a060dc863d682c9ae0f684dc3607d68f6040.tar.bz2
split opie vs qt stamp-headers / symlinks.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--Rules.make20
2 files changed, 16 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index f61f940..7646446 100644
--- a/Makefile
+++ b/Makefile
@@ -104,8 +104,8 @@ endif
104 104
105all clean lupdate lrelease install ipk: $(SUBDIRS) 105all clean lupdate lrelease install ipk: $(SUBDIRS)
106 106
107$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \ 107$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
108 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \ 108 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
109 $(TOPDIR)/library/custom.h 109 $(TOPDIR)/library/custom.h
110 110
111clean : $(TOPDIR)/.config 111clean : $(TOPDIR)/.config
diff --git a/Rules.make b/Rules.make
index 126e6af..1e4b205 100644
--- a/Rules.make
+++ b/Rules.make
@@ -26,6 +26,19 @@ $(TOPDIR)/.depends.cfgs:
26 26
27$(QTDIR)/stamp-headers : 27$(QTDIR)/stamp-headers :
28 @-rm -f $@* 28 @-rm -f $@*
29 ( cd $(QTDIR)/include; \
30 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
31 qcopchannel_qws.h qwindowsystem_qws.h \
32 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
33 touch $@
34
35$(QTDIR)/stamp-headers-x11 :
36 @-rm -f $@*
37 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)
38 touch $@
39
40$(OPIEDIR)/stamp-headers :
41 @-rm -f $@*
29 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 42 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
30 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 43 $(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; ) 44 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
@@ -37,13 +50,9 @@ $(QTDIR)/stamp-headers :
37 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 50 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
38 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 51 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
39 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 52 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
40 ( cd $(QTDIR)/include; \
41 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
42 qcopchannel_qws.h qwindowsystem_qws.h \
43 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
44 touch $@ 53 touch $@
45 54
46$(QTDIR)/stamp-headers-x11 : 55$(OPIEDIR)/stamp-headers-x11 :
47 @-rm -f $@* 56 @-rm -f $@*
48 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 57 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
49 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 58 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
@@ -57,7 +66,6 @@ $(QTDIR)/stamp-headers-x11 :
57 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 66 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
58 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 67 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
59 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 68 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
60 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)
61 touch $@ 69 touch $@
62 70
63$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 71$(TOPDIR)/library/custom.h : $(TOPDIR)/.config