[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox
From:       Luciano Montanaro <mikelima () cirulla ! net>
Date:       2005-09-02 12:49:56
Message-ID: 1125665396.005438.21559.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 456271 by montanaro:

Fix for --enable-final


 D             ChangeLog  
 M  +14 -0     konq-embed/ChangeLog  
 M  +4 -5      konq-embed/kdesrc/kdecore/Makefile.am  
 A             konq-embed/kdesrc/kdecore/network (directory)  
 A             konq-embed/kdesrc/kdecore/network/Makefile.am  
 M  +1 -0      konq-embed/kdesrc/kssl/Makefile.am.3.4  
 M  +9 -9      konq-embed/prepare_kde_src  


--- trunk/kdenox/konq-embed/ChangeLog #456270:456271
@@ -1,3 +1,17 @@
+2005-09-02  Luciano Montanaro <mikelima@cirulla.net>
+
+    * Fixed a few warnings
+
+    * Fixed --enable-final
+
+2005-08-26  Luciano Montanaro <mikelima@cirulla.net>
+
+    * ChangeLog file added to repository.
+    
+    * New patch for the http ioslave in kdelibs 3.4.2
+    
+    * Removed checks for older kdelibs from prepare_kde_src
+
 2002-12-02  Paul Chitescu  <paulc-devel@null.ro>
 
     * Added Javascript extension capability to embedded objects
--- trunk/kdenox/konq-embed/kdesrc/kdecore/Makefile.am #456270:456271
@@ -1,8 +1,9 @@
 
-SUBDIRS = malloc
+SUBDIRS = malloc network
 INCLUDES = -I$(top_srcdir)/konq-embed/dropin \
 	   -I$(top_srcdir)/konq-embed/dropin/kio \
 	   -I$(top_builddir)/konq-embed/kdesrc/kdecore \
+	   -I$(top_srcdir)/konq-embed/kdesrc/kdecore/network \
 	   $(QTOPIA_INCLUDES) $(all_includes)
 
 noinst_LTLIBRARIES = libkdecore.la
@@ -11,11 +12,9 @@
 			kentities.c kstandarddirs.cpp ktempfile.cpp \
 			ksavefile.cpp kmdcodec.cpp ksockaddr.cpp \
 			netsupp.cpp kextsock.cpp kbufferedio.cpp \
-	                kmultipledrag.cpp kasyncio.cpp kshell.cpp \
-			kresolver.cpp ksocketaddress.cpp kresolvermanager.cpp \
-			kresolverstandardworkers.cpp kresolverworkerbase.cpp
+	                kmultipledrag.cpp kasyncio.cpp kshell.cpp
 
-libkdecore_la_LIBADD = ../../dropin/libdropin.la
+libkdecore_la_LIBADD = ../../dropin/libdropin.la network/libkdecorenetwork.la 
 libkdecore_la_METASOURCES = AUTO
 
 KDE_OPTIONS = qtonly
--- trunk/kdenox/konq-embed/kdesrc/kssl/Makefile.am.3.4 #456270:456271
@@ -3,6 +3,7 @@
           -I$(top_srcdir)/konq-embed/kdesrc/kdecore \
 	  -I$(top_srcdir)/konq-embed/dropin/kssl \
 	  -I$(top_builddir)/konq-embed/kdesrc/kdecore \
+	  -I$(top_srcdir)/konq-embed/kdesrc/kdecore/network \
           $(SSL_INCLUDES) $(QTOPIA_INCLUDES) $(all_includes)
 
 noinst_LTLIBRARIES = libkssl.la
--- trunk/kdenox/konq-embed/prepare_kde_src #456270:456271
@@ -92,15 +92,15 @@
 		cp -p $src/kdecore/kshell.{cpp,h} $dst/kdecore/ 
 		cp -p $src/kdecore/fixx11h.h $dst/kdecore/
 		
-		cp -p $src/kdecore/network/kresolver.{cpp,h} $dst/kdecore
-		cp -p $src/kdecore/network/kresolver_p.h $dst/kdecore
-		cp -p $src/kdecore/network/kresolvermanager.cpp $dst/kdecore
-		cp -p $src/kdecore/network/kresolver_p.h $dst/kdecore
-		cp -p $src/kdecore/network/kresolverstandardworkers.cpp $dst/kdecore
-		cp -p $src/kdecore/network/kresolverstandardworkers_p.h $dst/kdecore
-		cp -p $src/kdecore/network/kresolverworkerbase.cpp $dst/kdecore
-		cp -p $src/kdecore/network/kresolverworkerbase.h $dst/kdecore
-		cp -p $src/kdecore/network/ksocketaddress.{cpp,h} $dst/kdecore
+		cp -p $src/kdecore/network/kresolver.{cpp,h} $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolver_p.h $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolvermanager.cpp $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolver_p.h $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolverstandardworkers.cpp $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolverstandardworkers_p.h $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolverworkerbase.cpp $dst/kdecore/network
+		cp -p $src/kdecore/network/kresolverworkerbase.h $dst/kdecore/network
+		cp -p $src/kdecore/network/ksocketaddress.{cpp,h} $dst/kdecore/network
 		
 		;;		
 esac
[prev in list] [next in list] [prev in thread] [next in thread]