diff -up CriticalMass-1.0.2/game/Makefile.in~ CriticalMass-1.0.2/game/Makefile.in
--- CriticalMass-1.0.2/game/Makefile.in~ 2007-11-29 22:09:43.000000000 +0100
+++ CriticalMass-1.0.2/game/Makefile.in 2007-11-29 22:09:43.000000000 +0100
@@ -71,7 +71,7 @@ am_critter_OBJECTS = ActionCallbacks.$(O
critter_OBJECTS = $(am_critter_OBJECTS)
critter_LDADD = $(LDADD)
@WIN32_TRUE@am__DEPENDENCIES_1 = critter.res
-critter_DEPENDENCIES = ../curl/lib/libcurl.a ../utils/libutils.a \
+critter_DEPENDENCIES = ../utils/libutils.a \
../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
../tinyxml/libtinyxml.a $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -231,10 +231,10 @@ critter_SOURCES = \
XMLHelper.cpp \
main.cpp
-LDADD = ../curl/lib/libcurl.a ../utils/libutils.a \
+LDADD = ../utils/libutils.a -lcurl \
../utilssdl/libutilssdl.a ../utilsgl/libutilsgl.a \
../tinyxml/libtinyxml.a $(am__append_1)
-@APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
+@APPLE_FALSE@@WIN32_FALSE@INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
@APPLE_TRUE@@WIN32_FALSE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
@WIN32_TRUE@INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"./\"
@WIN32_FALSE@pkgdata_DATA = resource.dat
diff -up CriticalMass-1.0.2/game/Makefile.am~ CriticalMass-1.0.2/game/Makefile.am
--- CriticalMass-1.0.2/game/Makefile.am~ 2007-11-29 22:09:03.000000000 +0100
+++ CriticalMass-1.0.2/game/Makefile.am 2007-11-29 22:09:03.000000000 +0100
@@ -41,7 +41,7 @@ critter_SOURCES = \
main.cpp
LDADD = \
- ../curl/lib/libcurl.a \
+ -lcurl \
../utils/libutils.a \
../utilssdl/libutilssdl.a \
../utilsgl/libutilsgl.a \
@@ -55,7 +55,7 @@ else
if APPLE
INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"/Contents/Resources/\"
else
-INCLUDES = -I../curl/include -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
+INCLUDES = -I../tinyxml -I../utils -I../utilssdl -I../utilsgl -DDATA_DIR=\"$(pkgdatadir)/\"
endif
endif
diff -up CriticalMass-1.0.2/Makefile.in~ CriticalMass-1.0.2/Makefile.in
--- CriticalMass-1.0.2/Makefile.in~ 2007-11-29 22:07:06.000000000 +0100
+++ CriticalMass-1.0.2/Makefile.in 2007-11-29 22:07:06.000000000 +0100
@@ -178,7 +178,7 @@ target_vendor = @target_vendor@
# require automake 1.4
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
DIST_SUBDIRS = $(SUBDIRS)
man_MANS = critter.6
EXTRA_DIST = $(man_MANS)
diff -up CriticalMass-1.0.2/Makefile.am~ CriticalMass-1.0.2/Makefile.am
--- CriticalMass-1.0.2/Makefile.am~ 2007-11-29 22:06:55.000000000 +0100
+++ CriticalMass-1.0.2/Makefile.am 2007-11-29 22:06:55.000000000 +0100
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = 1.4
## Any directories that you want built and installed should go here.
-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
## Any directories you want a part of the distribution should be listed
## here, as well as have a Makefile generated at the end of configure.in