From a7f1a060dc863d682c9ae0f684dc3607d68f6040 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Thu, 16 Jan 2003 18:52:05 +0000
Subject: split opie vs qt stamp-headers / symlinks.

---
diff --git a/Makefile b/Makefile
index f61f940..7646446 100644
--- a/Makefile
+++ b/Makefile
@@ -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
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:
 
 $(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
--
cgit v0.9.0.2