SOURCES (DEVEL): ClanLib-link.patch - updated for 0.8.0-RC1

[qboosh]

Author: qboosh                       Date: Fri Jan 27 06:09:51 2006 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated for 0.8.0-RC1

---- Files affected:
SOURCES:
   ClanLib-link.patch (1.1.2.4 -> 1.1.2.5) 

---- Diffs:

================================================================
Index: SOURCES/ClanLib-link.patch
diff -u SOURCES/ClanLib-link.patch:1.1.2.4 SOURCES/ClanLib-link.patch:1.1.2.5
--- SOURCES/ClanLib-link.patch:1.1.2.4	Sat May 15 00:34:53 2004
+++ SOURCES/ClanLib-link.patch	Fri Jan 27 07:09:46 2006
@@ -20,14 +20,14 @@
  endif
  
  libclanDisplay_la_SOURCES = \
---- ClanLib-0.7.8/Sources/GL/Makefile.am.orig	2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.8/Sources/GL/Makefile.am	2003-10-09 23:17:58.726372712 +0200
-@@ -37,7 +37,7 @@
- GLX/input_device_x11mouse.h \
- GLX/input_device_x11keyboard.cpp \
- GLX/input_device_x11keyboard.h
--libclanGL_la_LIBADD = -lGL -lGLU -lXxf86vm
-+libclanGL_la_LIBADD = -lGL -lGLU -lXxf86vm ../Display/libclanDisplay.la
+--- ClanLib-0.8.0-RC1/Sources/GL/Makefile.am.orig	2005-02-11 15:13:43.000000000 +0100
++++ ClanLib-0.8.0-RC1/Sources/GL/Makefile.am	2006-01-25 23:38:11.091887750 +0100
+@@ -51,7 +51,7 @@
+ GLX/input_device_x11keyboard.h \
+ GLX/input_device_xinput.cpp \
+ GLX/input_device_xinput.h
+-libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL 
++libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL ../Display/libclanDisplay.la
  endif
  
  EXTRA_DIST = \
@@ -105,14 +105,54 @@
  
  libclanVorbis_la_LDFLAGS = \
    -release $(LT_RELEASE) \
---- ClanLib-0.7.8/Sources/Core/Makefile.am.orig	2003-11-11 11:13:24.000000000 +0100
-+++ ClanLib-0.7.8/Sources/Core/Makefile.am	2003-11-14 07:40:34.643122784 +0100
-@@ -115,7 +115,7 @@
+--- ClanLib-0.8.0-RC1/Sources/Core/Makefile.am.orig	2005-07-10 01:25:31.000000000 +0200
++++ ClanLib-0.8.0-RC1/Sources/Core/Makefile.am	2006-01-26 21:57:59.647858500 +0100
+@@ -125,7 +125,7 @@
  endif
  
  # FIXME: Hardcoding these here might not be a good idea
 -libclanCore_la_LIBADD = @LIBPTHREAD@
-+libclanCore_la_LIBADD = @LIBPTHREAD@ -ldl
++libclanCore_la_LIBADD = @LIBPTHREAD@ ../Signals/libclanSignals.la -ldl
  
  libclanCore_la_LDFLAGS = \
    -release $(LT_RELEASE) \
+--- ClanLib-0.8.0-RC1/configure.ac.orig	2005-10-20 22:57:15.000000000 +0200
++++ ClanLib-0.8.0-RC1/configure.ac	2006-01-26 18:13:46.567093500 +0100
+@@ -422,16 +422,15 @@
+ CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
+ 
+ # Modules which will be build
+-ClanLib_Modules="Application"
+-ClanLib_pkgconfig="clanApp.pc"
++ClanLib_Modules="Signals Core Application"
++ClanLib_pkgconfig="clanSignals.pc clanCore.pc clanApp.pc"
+ 
+ # API header files for the Modules which will be installed
+-ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
++ClanLib_API_Modules="$ClanLib_API_Modules \$(clanSignals_includes) \$(clanCore_includes) \$(clanApp_includes)"
+ 
+ # Default examples which will be build
+ ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
+ 
+-CLANLIB_ENABLE_MODULES([Core Signals])
+ 
+ if test "$enable_clanDisplay" = "yes"; then
+     CLANLIB_ENABLE_MODULES(Display)
+@@ -625,6 +624,8 @@
+ AC_SUBST(ClanLib_Examples)
+ 
+ AC_CONFIG_FILES([
++        pkgconfig/clanSignals.pc
++        pkgconfig/clanCore.pc
+         pkgconfig/clanApp.pc
+         pkgconfig/Makefile
+         Makefile
+@@ -632,6 +633,8 @@
+         Examples/Makefile.conf
+         Setup/Makefile
+         Sources/API/Makefile
++        Sources/Signals/Makefile
++        Sources/Core/Makefile
+         Sources/Application/Makefile
+         Sources/Makefile
+         Tests/Makefile.conf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ClanLib-link.patch?r1=1.1.2.4&r2=1.1.2.5&f=u