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
4 libclanApp_la_SOURCES = Unix/clanapp.cpp
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
14 # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
17 -libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
18 +libclanDisplay_la_LIBADD = -lX11 -lpng -ljpeg -lXxf86vm @X_LIBS@ ../Core/libclanCore.la
21 libclanDisplay_la_SOURCES = \
22 --- ClanLib-0.8.0-RC1/Sources/GL/Makefile.am.orig 2005-02-11 15:13:43.000000000 +0100
23 +++ ClanLib-0.8.0-RC1/Sources/GL/Makefile.am 2006-01-25 23:38:11.091887750 +0100
25 GLX/input_device_x11keyboard.h \
26 GLX/input_device_xinput.cpp \
27 GLX/input_device_xinput.h
28 -libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL
29 +libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL ../Display/libclanDisplay.la
33 --- ClanLib-0.7.4/Sources/GUI/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
34 +++ ClanLib-0.7.4/Sources/GUI/Makefile.am 2003-10-09 23:19:13.152058288 +0200
39 +libclanGUI_la_LIBADD = ../Display/libclanDisplay.la
41 libclanGUI_la_LDFLAGS = \
42 -release $(LT_RELEASE) \
43 -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
44 --- ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
45 +++ ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am 2003-10-09 23:21:06.631806744 +0200
47 image_silver.h progressbar_silver.h window_silver.h \
48 inputbox_silver.h radiobutton_silver.h
50 +libclanGUIStyleSilver_la_LIBADD = ../GUI/libclanGUI.la
51 libclanGUIStyleSilver_la_LDFLAGS = \
52 -release $(LT_RELEASE) \
53 -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
54 --- ClanLib-0.7.4/Sources/MikMod/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
55 +++ ClanLib-0.7.4/Sources/MikMod/Makefile.am 2003-10-09 23:24:59.453412480 +0200
57 soundprovider_mikmod.cpp \
58 soundprovider_mikmod_session.cpp
60 -libclanMikMod_la_LIBADD = -lmikmod
61 +libclanMikMod_la_LIBADD = -lmikmod ../Sound/libclanSound.la
63 libclanMikMod_la_LDFLAGS = \
64 -release $(LT_RELEASE) \
65 --- ClanLib-0.7.4/Sources/Network/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
66 +++ ClanLib-0.7.4/Sources/Network/Makefile.am 2003-10-09 23:25:43.592702288 +0200
68 libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
71 +libclanNetwork_la_LIBADD = ../Core/libclanCore.la
72 libclanNetwork_la_LDFLAGS = \
73 -release $(LT_RELEASE) \
74 -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
75 --- ClanLib-0.7.4/Sources/SDL/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
76 +++ ClanLib-0.7.4/Sources/SDL/Makefile.am 2003-10-09 23:26:23.644613472 +0200
80 libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
81 -libclanSDL_la_LIBADD = $(SDL_LIBS)
82 +libclanSDL_la_LIBADD = $(SDL_LIBS) ../Display/libclanDisplay.la
84 libclanSDL_la_LDFLAGS = \
85 -release $(LT_RELEASE) \
86 --- ClanLib-0.7.4/Sources/Sound/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
87 +++ ClanLib-0.7.4/Sources/Sound/Makefile.am 2003-10-09 23:27:44.491322904 +0200
89 Unix/soundoutput_oss.h
92 +libclanSound_la_LIBADD = ../Core/libclanCore.la
93 libclanSound_la_LDFLAGS = \
94 -release $(LT_RELEASE) \
95 -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
96 --- ClanLib-0.7.4/Sources/Vorbis/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
97 +++ ClanLib-0.7.4/Sources/Vorbis/Makefile.am 2003-10-09 23:28:39.064026592 +0200
99 soundprovider_vorbis.cpp \
100 soundprovider_vorbis_session.cpp
102 -libclanVorbis_la_LIBADD = -logg -lvorbis
103 +libclanVorbis_la_LIBADD = -logg -lvorbis ../Sound/libclanSound.la
105 libclanVorbis_la_LDFLAGS = \
106 -release $(LT_RELEASE) \
107 --- ClanLib-0.8.0-RC1/Sources/Core/Makefile.am.orig 2005-07-10 01:25:31.000000000 +0200
108 +++ ClanLib-0.8.0-RC1/Sources/Core/Makefile.am 2006-01-26 21:57:59.647858500 +0100
112 # FIXME: Hardcoding these here might not be a good idea
113 -libclanCore_la_LIBADD = @LIBPTHREAD@
114 +libclanCore_la_LIBADD = @LIBPTHREAD@ ../Signals/libclanSignals.la -ldl
116 libclanCore_la_LDFLAGS = \
117 -release $(LT_RELEASE) \
118 --- ClanLib-0.8.0-RC1/configure.ac.orig 2005-10-20 22:57:15.000000000 +0200
119 +++ ClanLib-0.8.0-RC1/configure.ac 2006-01-26 18:13:46.567093500 +0100
120 @@ -422,16 +422,15 @@
121 CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
123 # Modules which will be build
124 -ClanLib_Modules="Application"
125 -ClanLib_pkgconfig="clanApp.pc"
126 +ClanLib_Modules="Signals Core Application"
127 +ClanLib_pkgconfig="clanSignals.pc clanCore.pc clanApp.pc"
129 # API header files for the Modules which will be installed
130 -ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
131 +ClanLib_API_Modules="$ClanLib_API_Modules \$(clanSignals_includes) \$(clanCore_includes) \$(clanApp_includes)"
133 # Default examples which will be build
134 ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
136 -CLANLIB_ENABLE_MODULES([Core Signals])
138 if test "$enable_clanDisplay" = "yes"; then
139 CLANLIB_ENABLE_MODULES(Display)
141 AC_SUBST(ClanLib_Examples)
144 + pkgconfig/clanSignals.pc
145 + pkgconfig/clanCore.pc
150 Examples/Makefile.conf
153 + Sources/Signals/Makefile
154 + Sources/Core/Makefile
155 Sources/Application/Makefile