ClanLib-link.patch

   1 --- ClanLib-0.7.4/Sources/Application/Makefile.am.orig  2003-09-15 16:18:50.000000000 +0200
   2 +++ ClanLib-0.7.4/Sources/Application/Makefile.am       2003-10-09 23:15:08.843198880 +0200
   3 @@ -6,6 +6,7 @@
   4  libclanApp_la_SOURCES = Unix/clanapp.cpp
   5  endif
   6
   7 +libclanApp_la_LIBADD = ../Core/libclanCore.la
   8  libclanApp_la_LDFLAGS = \
   9    -release $(LT_RELEASE) \
  10    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  11 --- ClanLib-0.7.8/Sources/Display/Makefile.am.orig      2003-09-15 16:18:50.000000000 +0200
  12 +++ ClanLib-0.7.8/Sources/Display/Makefile.am   2003-10-09 23:16:41.208157272 +0200
  13 @@ -3,7 +3,8 @@
  14  # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
  15  if WIN32
  16  else
  17 -libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
  18 +LXLIBDIR=-L/usr/X11R6/lib
  19 +libclanDisplay_la_LIBADD = $(LXLIBDIR) -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@ ../Core/libclanCore.la
  20  endif
  21
  22  libclanDisplay_la_SOURCES = \
  23 --- ClanLib-0.8.0-RC1/Sources/GL/Makefile.am.orig       2005-02-11 15:13:43.000000000 +0100
  24 +++ ClanLib-0.8.0-RC1/Sources/GL/Makefile.am    2006-01-25 23:38:11.091887750 +0100
  25 @@ -51,7 +51,7 @@
  26  GLX/input_device_x11keyboard.h \
  27  GLX/input_device_xinput.cpp \
  28  GLX/input_device_xinput.h
  29 -libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL
  30 +libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL ../Display/libclanDisplay.la
  31  endif
  32
  33  EXTRA_DIST = \
  34 --- ClanLib-0.7.4/Sources/GUI/Makefile.am.orig  2003-09-15 16:18:50.000000000 +0200
  35 +++ ClanLib-0.7.4/Sources/GUI/Makefile.am       2003-10-09 23:19:13.152058288 +0200
  36 @@ -82,6 +82,8 @@
  37  filedialog.cpp \
  38  window_generic.h
  39
  40 +libclanGUI_la_LIBADD = ../Display/libclanDisplay.la
  41 +
  42  libclanGUI_la_LDFLAGS = \
  43    -release $(LT_RELEASE) \
  44    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  45 --- ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am.orig       2003-09-15 16:18:50.000000000 +0200
  46 +++ ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am    2003-10-09 23:21:06.631806744 +0200
  47 @@ -10,6 +10,7 @@
  48  image_silver.h     progressbar_silver.h  window_silver.h \
  49  inputbox_silver.h  radiobutton_silver.h
  50
  51 +libclanGUIStyleSilver_la_LIBADD = ../GUI/libclanGUI.la
  52  libclanGUIStyleSilver_la_LDFLAGS = \
  53    -release $(LT_RELEASE) \
  54    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  55 --- ClanLib-0.7.4/Sources/MikMod/Makefile.am.orig       2003-09-15 16:18:50.000000000 +0200
  56 +++ ClanLib-0.7.4/Sources/MikMod/Makefile.am    2003-10-09 23:24:59.453412480 +0200
  57 @@ -8,7 +8,7 @@
  58   soundprovider_mikmod.cpp   \
  59   soundprovider_mikmod_session.cpp
  60
  61 -libclanMikMod_la_LIBADD = -lmikmod
  62 +libclanMikMod_la_LIBADD = -lmikmod ../Sound/libclanSound.la
  63
  64  libclanMikMod_la_LDFLAGS = \
  65    -release $(LT_RELEASE) \
  66 --- ClanLib-0.7.4/Sources/Network/Makefile.am.orig      2003-09-15 16:18:50.000000000 +0200
  67 +++ ClanLib-0.7.4/Sources/Network/Makefile.am   2003-10-09 23:25:43.592702288 +0200
  68 @@ -69,6 +69,7 @@
  69  libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
  70  endif
  71
  72 +libclanNetwork_la_LIBADD = ../Core/libclanCore.la
  73  libclanNetwork_la_LDFLAGS = \
  74    -release $(LT_RELEASE) \
  75    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  76 --- ClanLib-0.7.4/Sources/SDL/Makefile.am.orig  2003-09-15 16:18:50.000000000 +0200
  77 +++ ClanLib-0.7.4/Sources/SDL/Makefile.am       2003-10-09 23:26:23.644613472 +0200
  78 @@ -20,7 +20,7 @@
  79  surface_sdl.h
  80
  81  libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
  82 -libclanSDL_la_LIBADD   = $(SDL_LIBS)
  83 +libclanSDL_la_LIBADD   = $(SDL_LIBS) ../Display/libclanDisplay.la
  84
  85  libclanSDL_la_LDFLAGS = \
  86    -release $(LT_RELEASE) \
  87 --- ClanLib-0.7.4/Sources/Sound/Makefile.am.orig        2003-09-15 16:18:50.000000000 +0200
  88 +++ ClanLib-0.7.4/Sources/Sound/Makefile.am     2003-10-09 23:27:44.491322904 +0200
  89 @@ -36,6 +36,7 @@
  90  Unix/soundoutput_oss.h
  91  endif
  92
  93 +libclanSound_la_LIBADD = ../Core/libclanCore.la
  94  libclanSound_la_LDFLAGS = \
  95    -release $(LT_RELEASE) \
  96    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  97 --- ClanLib-0.7.4/Sources/Vorbis/Makefile.am.orig       2003-09-15 16:18:50.000000000 +0200
  98 +++ ClanLib-0.7.4/Sources/Vorbis/Makefile.am    2003-10-09 23:28:39.064026592 +0200
  99 @@ -5,7 +5,7 @@
 100         soundprovider_vorbis.cpp \
 101         soundprovider_vorbis_session.cpp
 102
 103 -libclanVorbis_la_LIBADD = -logg -lvorbis
 104 +libclanVorbis_la_LIBADD = -logg -lvorbis ../Sound/libclanSound.la
 105
 106  libclanVorbis_la_LDFLAGS = \
 107    -release $(LT_RELEASE) \
 108 --- ClanLib-0.8.0-RC1/Sources/Core/Makefile.am.orig     2005-07-10 01:25:31.000000000 +0200
 109 +++ ClanLib-0.8.0-RC1/Sources/Core/Makefile.am  2006-01-26 21:57:59.647858500 +0100
 110 @@ -125,7 +125,7 @@
 111  endif
 112
 113  # FIXME: Hardcoding these here might not be a good idea
 114 -libclanCore_la_LIBADD = @LIBPTHREAD@
 115 +libclanCore_la_LIBADD = @LIBPTHREAD@ ../Signals/libclanSignals.la -ldl
 116
 117  libclanCore_la_LDFLAGS = \
 118    -release $(LT_RELEASE) \
 119 --- ClanLib-0.8.0-RC1/configure.ac.orig 2005-10-20 22:57:15.000000000 +0200
 120 +++ ClanLib-0.8.0-RC1/configure.ac      2006-01-26 18:13:46.567093500 +0100
 121 @@ -422,16 +422,15 @@
 122  CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
 123
 124  # Modules which will be build
 125 -ClanLib_Modules="Application"
 126 -ClanLib_pkgconfig="clanApp.pc"
 127 +ClanLib_Modules="Signals Core Application"
 128 +ClanLib_pkgconfig="clanSignals.pc clanCore.pc clanApp.pc"
 129
 130  # API header files for the Modules which will be installed
 131 -ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
 132 +ClanLib_API_Modules="$ClanLib_API_Modules \$(clanSignals_includes) \$(clanCore_includes) \$(clanApp_includes)"
 133
 134  # Default examples which will be build
 135  ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
 136
 137 -CLANLIB_ENABLE_MODULES([Core Signals])
 138
 139  if test "$enable_clanDisplay" = "yes"; then
 140      CLANLIB_ENABLE_MODULES(Display)
 141 @@ -625,6 +624,8 @@
 142  AC_SUBST(ClanLib_Examples)
 143
 144  AC_CONFIG_FILES([
 145 +        pkgconfig/clanSignals.pc
 146 +        pkgconfig/clanCore.pc
 147          pkgconfig/clanApp.pc
 148          pkgconfig/Makefile
 149          Makefile
 150 @@ -632,6 +633,8 @@
 151          Examples/Makefile.conf
 152          Setup/Makefile
 153          Sources/API/Makefile
 154 +        Sources/Signals/Makefile
 155 +        Sources/Core/Makefile
 156          Sources/Application/Makefile
 157          Sources/Makefile
 158          Tests/Makefile.conf