| author | kergoth <kergoth> | 2003-01-16 18:52:05 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-01-16 18:52:05 (UTC) |
| commit | a7f1a060dc863d682c9ae0f684dc3607d68f6040 (patch) (side-by-side diff) | |
| tree | 5d2d4a44e31a706c28cfda9d01fbd411004f0f8a | |
| parent | 0d4f9c31c5d86e4a2667719fd7d1cba26b00d263 (diff) | |
| download | opie-a7f1a060dc863d682c9ae0f684dc3607d68f6040.zip opie-a7f1a060dc863d682c9ae0f684dc3607d68f6040.tar.gz opie-a7f1a060dc863d682c9ae0f684dc3607d68f6040.tar.bz2 | |
split opie vs qt stamp-headers / symlinks.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Rules.make | 20 |
2 files changed, 16 insertions, 8 deletions
@@ -104,8 +104,8 @@ endif all clean lupdate lrelease install ipk: $(SUBDIRS) -$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \ - $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \ +$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ + $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ $(TOPDIR)/library/custom.h clean : $(TOPDIR)/.config @@ -26,6 +26,19 @@ $(TOPDIR)/.depends.cfgs: $(QTDIR)/stamp-headers : @-rm -f $@* + ( cd $(QTDIR)/include; \ + $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ + qcopchannel_qws.h qwindowsystem_qws.h \ + qfontmanager_qws.h qwsdefaultdecoration_qws.h)) + touch $@ + +$(QTDIR)/stamp-headers-x11 : + @-rm -f $@* + 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) + touch $@ + +$(OPIEDIR)/stamp-headers : + @-rm -f $@* mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private ( 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 : ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h - ( cd $(QTDIR)/include; \ - $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ - qcopchannel_qws.h qwindowsystem_qws.h \ - qfontmanager_qws.h qwsdefaultdecoration_qws.h)) touch $@ -$(QTDIR)/stamp-headers-x11 : +$(OPIEDIR)/stamp-headers-x11 : @-rm -f $@* mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private @@ -57,7 +66,6 @@ $(QTDIR)/stamp-headers-x11 : ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) - 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) touch $@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |