[Kde-cygwin-cvs] CVS: qt-3/qmake/generators/unix unixmake2.cpp,1.1.1.19,1.1.1.20

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

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

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	unixmake2.cpp 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: unixmake2.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/unix/unixmake2.cpp,v
retrieving revision 1.1.1.19
retrieving revision 1.1.1.20
diff -u -r1.1.1.19 -r1.1.1.20
--- unixmake2.cpp	22 Sep 2005 12:57:30 -0000	1.1.1.19
+++ unixmake2.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.20
@@ -289,12 +289,33 @@
     t << "DESTDIR  = " << var("DESTDIR") << endl;
     if(project->isActiveConfig("compile_libtool"))
 	t << "TARGETL	= " << var("TARGET_la") << endl;
-    t << "TARGET   = " << var("TARGET") << endl;
-    if(project->isActiveConfig("plugin") ) {
-	t << "TARGETD   = " << var("TARGET") << endl;
+
+		if(!project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
+			if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("dll")) {
+				if(project->isActiveConfig("plugin") ) {
+					t << "TARGET   = cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << endl;
+					t << "TARGET0   = " << "lib" << var("QMAKE_ORIG_TARGET") << ".dll.a"  << endl;
+				}
+				else {
+					t << "TARGET   = ../bin/cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << endl;
+					t << "TARGET0   = " << "lib" << var("QMAKE_ORIG_TARGET") << ".dll.a"  << endl;
+					t << "TARGETA   = " << var("TARGETA") << endl;
+				}
+			}
+			else if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("staticlib")) {
+				t << "TARGET   = " << "lib" << var("QMAKE_ORIG_TARGET") << ".a" << endl;
+			}
+			else if (project->first("TEMPLATE") == "app") {
+				t << "TARGET   = " << var("TARGET") << endl;
+			}
+		}
+   else {
+ 		t << "TARGET   = " << var("TARGET") << endl;
+  	if(project->isActiveConfig("plugin") ) {
+			t << "TARGETD   = " << var("TARGET") << endl;
     } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
-	t << "TARGETA	= " << var("TARGETA") << endl;
-	if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
+			t << "TARGETA	= " << var("TARGETA") << endl;
+			if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
 	    t << "TARGETD	= " << var("TARGET_x.y.z") << endl;
 	    t << "TARGET0	= " << var("TARGET_") << endl;
 	    t << "TARGET1	= " << var("TARGET_x") << endl;
@@ -304,6 +325,7 @@
 	    t << "TARGET0	= " << var("TARGET_") << endl;
 	}
     }
+  }
     writeExtraVariables(t);
     t << endl;
 
@@ -548,9 +570,21 @@
 	if(!project->isEmpty("QMAKE_PRE_LINK"))
 	    t << "\n\t" << var("QMAKE_PRE_LINK");
 
+	if(!destdir.isEmpty() && !project->isEmpty("QMAKE_CYGWIN_SHLIB") && !project->isActiveConfig("plugin") )
+    t << "\n\t" << "test -d " << destdir << "../bin || mkdir -p " << destdir << "../bin";
+
 	if(project->isActiveConfig("compile_libtool")) {
 	    t << "\n\t"
 	      << var("QMAKE_LINK_SHLIB_CMD");
+	} else if(!project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
+        project->variables()["QMAKE_LINK_SHLIB_CMD"] = "$(LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)";
+    t << "\n\t"
+      << "-$(DEL_FILE) $(DESTDIR)$(TARGET) $(DESTDIR)$(TARGET0)" << "\n\t"
+      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
+    t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(DESTDIR)$(TARGET0)");
+    if(!project->isEmpty("QMAKE_POST_LINK"))
+        t << "\n\t" << var("QMAKE_POST_LINK");
+    t << endl << endl;
 	} else if(project->isActiveConfig("plugin")) {
 	    t << "\n\t"
 	      << "-$(DEL_FILE) $(TARGET)" << "\n\t"
@@ -1409,8 +1443,10 @@
     if(dot != -1)
 	ret = ret.left(dot);
     ret += Option::libtool_ext;
-    if(!project->isEmpty("DESTDIR"))
+    if(!project->isEmpty("DESTDIR")) {
 	ret.prepend(var("DESTDIR"));
+	ret = Option::fixPathToLocalOS(fileFixify(ret,QDir::currentDirPath(), Option::output_dir));
+		}
     return ret;
 }
 
@@ -1432,15 +1468,26 @@
     t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt "
       << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
 
-    t << "# The name that we can dlopen(3).\n"
-      << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
+    t << "# The name that we can dlopen(3).\n";
+    
+    if (!project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
+    	if(project->isActiveConfig("plugin") )
+				t << "dlname='cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << "'\n\n" << endl;
+			else
+				t << "dlname='../bin/cyg" << var("QMAKE_ORIG_TARGET") << "-" << var("VER_MAJ") << "." << var("QMAKE_EXTENSION_SHLIB") << "'\n\n" << endl;
+		}
+    else {  
+      t << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
       << "'\n\n";
-
+		}
     t << "# Names of this library.\n";
     t << "library_names='";
     if(project->isActiveConfig("plugin")) {
 	t << var("TARGET");
-    } else {
+    } else if(!project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
+			t << "lib" << var("QMAKE_ORIG_TARGET") << ".dll.a";
+    }
+    else {
     	if (project->isEmpty("QMAKE_HPUX_SHLIB"))
 	    t << var("TARGET_x.y.z") << " ";
     	t << var("TARGET_x") << " " << var("TARGET_");