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

List:       kde-artists
Subject:    [kde-artists] branches/work/kde4
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-05-19 22:07:09
Message-ID: 1116540429.042768.3447.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 415900 by marchand:

added aliases : 
LIB_QTCORE, LIB_QTGUI, LIB_QTSQL, LIB_QTXML, LIB_QTNETWORK, LIB_QT3SUPPORT, LIB_QTDESIGNER, LIB_QTOPENGL 



 M  +9 -0      branches/work/kde4/kde-common/admin/acinclude.m4.in  
 M  +1 -1      branches/work/kde4/kdelibs/dcop/Makefile.am  
 M  +1 -1      branches/work/kde4/kdelibs/dcop/dcopidl2cpp/Makefile.am  
 M  +1 -1      branches/work/kde4/kdelibs/pics/Makefile.am  


--- branches/work/kde4/kde-common/admin/acinclude.m4.in #415899:415900
@@ -1654,6 +1654,15 @@
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
+#these are for Qt4 libs separation
+   AC_SUBST(LIB_QTCORE, "-lQtCore_debug")
+   AC_SUBST(LIB_QTXML, "-lQtXml_debug")
+   AC_SUBST(LIB_QTGUI, "-lQtGui_debug")
+   AC_SUBST(LIB_QTNETWORK, "-lQtNetwork_debug")
+   AC_SUBST(LIB_QTOPENGL, "-lQtOpenGL_debug")
+   AC_SUBST(LIB_QTSQL, "-lQtSql_debug")
+   AC_SUBST(LIB_QT3SUPPORT, "-lQt3Support_debug")
+   AC_SUBST(LIB_QTDESIGNER, "-lQtDesigner_debug")
 ])
 
 AC_DEFUN([AC_PATH_KDE],
--- branches/work/kde4/kdelibs/dcop/Makefile.am #415899:415900
@@ -31,7 +31,7 @@
  # dcop_deadlock_test
 
 lib_LTLIBRARIES  = libDCOP.la 
-libDCOP_la_LIBADD = KDE-ICE/libkICE.la -lQtCore_debug $(LIB_QT) -lQt3Support_debug
+libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QTCORE) $(LIB_QT) $(LIB_QT3SUPPORT)
 libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
 libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
 libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
--- branches/work/kde4/kdelibs/dcop/dcopidl2cpp/Makefile.am #415899:415900
@@ -9,7 +9,7 @@
 dcopidl2cpp_SOURCES = main.cpp skel.cpp stub.cpp stubimpl.cpp
 noinst_HEADERS = main.h
 
-dcopidl2cpp_LDADD = $(LIB_QT) -lQtXml_debug
+dcopidl2cpp_LDADD = $(LIB_QT) $(LIB_QTXML)
 dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
 
 dcopidl_output.kidl: $(DCOPIDL) $(srcdir)/dcopidl_test.h
--- branches/work/kde4/kdelibs/pics/Makefile.am #415899:415900
@@ -8,7 +8,7 @@
 
 bin_PROGRAMS = kimage_concat $(KSVGTOPNG)
 kimage_concat_SOURCES = kimage_concat.cpp
-kimage_concat_LDADD = $(LIB_QT) -lQt3Support_debug
+kimage_concat_LDADD = $(LIB_QT) $(LIB_QT3SUPPORT)
 kimage_concat_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 
 ksvgtopng_SOURCES = ksvgtopng.cpp
______________________________________________________________________________
kde-artists@mail.kde.org |  https://mail.kde.org/mailman/listinfo/kde-artists
[prev in list] [next in list] [prev in thread] [next in thread]