[Kde-cygwin-cvs] CVS: qt-3 Makefile.win32-borland,1.1.2.2,1.1.2.2.2.1 Makefile.win32-g++,1.1.2.1,1.1.2.1.2.1 Makefile.win32-msvc,1.1.2.1,1.1.2.1.2.1

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5578

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	Makefile.win32-borland Makefile.win32-g++ Makefile.win32-msvc 
Log Message:
forgot Makefile.main in some cases

Index: Makefile.win32-borland
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/Makefile.win32-borland,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -r1.1.2.2 -r1.1.2.2.2.1
--- Makefile.win32-borland	23 Aug 2004 05:56:56 -0000	1.1.2.2
+++ Makefile.win32-borland	14 Oct 2005 20:01:59 -0000	1.1.2.2.2.1
@@ -32,8 +32,10 @@
 #Qt
 src-uninstall: .qmake.cache
 	(cd src & $(MAKE) uninstall & cd ..)
+	(cd src & $(MAKE) -f Makefile.main uninstall & cd ..)
 src-install: sub-src
 	(cd src & $(MAKE) install & cd ..)
+	(cd src & $(MAKE) -f Makefile.main install & cd ..)
 sub-src: src-moc .qmake.cache FORCE
 	(cd src & $(MAKE) & cd ..)
 	(cd src & $(MAKE) -f Makefile.main & cd ..)
@@ -85,6 +87,7 @@
 	(cd tools & $(MAKE) $@ & cd ..)
 	(cd src\moc & $(MAKE) $@ & cd ..\..)
 	(cd src & $(MAKE) $@ & cd ..)
+	(cd src && $(MAKE) -f Makefile.main $@ & cd ..)
 	(cd tutorial & $(MAKE) $@ & cd ..)
 	(cd plugins\src & $(MAKE) $@ & cd ..\..)
 	(cd examples & $(MAKE) $@ & cd ..)

Index: Makefile.win32-g++
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/Makefile.win32-g++,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- Makefile.win32-g++	6 Aug 2004 05:44:35 -0000	1.1.2.1
+++ Makefile.win32-g++	14 Oct 2005 20:01:59 -0000	1.1.2.1.2.1
@@ -85,6 +85,7 @@
 	cd tools && $(MAKE) $@
 	cd src\moc && $(MAKE) $@
 	cd src && $(MAKE) $@
+	cd src && $(MAKE) -f Makefile.main $@
 	cd tutorial && $(MAKE) $@
 	cd plugins\src && $(MAKE) $@
 	cd examples && $(MAKE) $@

Index: Makefile.win32-msvc
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/Attic/Makefile.win32-msvc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- Makefile.win32-msvc	6 Aug 2004 05:44:35 -0000	1.1.2.1
+++ Makefile.win32-msvc	14 Oct 2005 20:01:59 -0000	1.1.2.1.2.1
@@ -32,8 +32,10 @@
 #Qt
 src-uninstall: .qmake.cache
 	cd src && $(MAKE) uninstall
+	cd src && $(MAKE) -f Makefile.main uninstall
 src-install: sub-src
 	cd src && $(MAKE) install
+	cd src && $(MAKE) -f Makefile.main install
 sub-src: src-moc .qmake.cache FORCE
 	cd src && $(MAKE)
 	cd src && $(MAKE) -f Makefile.main
@@ -82,11 +84,10 @@
 	cd tools && $(MAKE) $@
 	cd src\moc && $(MAKE) $@
 	cd src && $(MAKE) $@
+	cd src && $(MAKE) -f Makefile.main $@
 	cd tutorial && $(MAKE) $@
 	cd plugins\src && $(MAKE) $@
 	cd examples && $(MAKE) $@
-	cd config.tests/unix/stl && $(MAKE) $@
-  if exist config.tests/x11/notype/Makefile cd config.tests/x11/notype && $(MAKE) $@
 	cd qmake && $(MAKE) $@
 
 #confclean is actually the same as distclean, except qmake and moc