# fix linking (due --as-needed)

--- src/math/Makefile.am.orig	2003-03-03 12:18:16 +0300

+++ src/math/Makefile.am	2008-06-08 16:24:04 +0400

@@ -3,6 +3,7 @@

 pkglib_LTLIBRARIES = libmath.la

 libmath_la_LIBADD = \

+../auxil/libauxil.la \

 $(L_MATH)

 libmath_la_SOURCES = \

--- src/wld/Makefile.am.orig	2008-06-08 16:01:20 +0400

+++ src/wld/Makefile.am	2008-06-08 16:01:24 +0400

@@ -14,6 +14,10 @@ primdb.h \

 world.cxx \

 world.h

+libwld_la_LIBADD = \

+../rot/librot.la \

+../auxil/libauxil.la

+

 tst_SOURCES = \

 tst.cxx

--- src/inp/Makefile.am.orig	2003-03-03 12:12:55 +0300

+++ src/inp/Makefile.am	2008-06-08 16:00:38 +0400

@@ -13,6 +13,11 @@ inpsdl.h \

 inpkey.cxx \

 inpkey.h

+libinp_la_LIBADD = \

+../auxil/libauxil.la \

+$(SDL_LIBS) \

+$(L_X11)

+

 tst_SOURCES = \

 tst.cxx

--- src/pres/Makefile.am.orig	2003-03-03 12:12:49 +0300

+++ src/pres/Makefile.am	2008-06-08 16:02:27 +0400

@@ -30,6 +30,11 @@ shield.cxx \

 generator.h \

 generator.cxx

+libpres_la_LIBADD = \

+../rot/librot.la \

+../wld/libwld.la \

+../snd/libsnd.la

+

 tst_SOURCES = \

 tst.cxx

# move sprite to lib, it so objects (precompiled - x86_64 unsupported?)

--- src/auxil/Makefile.am.orig	2004-08-30 19:02:56 +0400

+++ src/auxil/Makefile.am	2008-06-08 16:08:36 +0400

@@ -9,5 +9,5 @@ log.cxx \

 auxil.h \

 timer.h

-CXXFLAGS += -DNBROOT=\"$(pkgdatadir)\"

+AM_CXXFLAGS = -DNBROOT=\"$(pkgdatadir)\" -DLIBROOT=\"$(pkglibdir)\"

--- src/auxil/auxil.cxx.orig	2003-03-03 12:13:00 +0300

+++ src/auxil/auxil.cxx	2008-06-08 16:09:50 +0400

@@ -93,7 +93,7 @@ std::string GetSpritePath()

   if (path)

     return path;

-  return GetRootPath() + "/sprite/";

+  return LIBROOT "/sprite/";

 }

 //

--- configure.in.orig	2004-08-30 18:54:05 +0400

+++ configure.in	2008-06-08 16:19:38 +0400

@@ -22,7 +22,7 @@ AC_PROG_CXX

 AC_PROG_CXXCPP

 AC_PROG_INSTALL

 AM_PROG_LIBTOOL

-

+AM_PROG_AS

 L_CXX=

# fix smp building

--- src/rot/Makefile.am.orig	2004-08-30 19:17:05 +0400

+++ src/rot/Makefile.am	2008-06-08 16:18:03 +0400

@@ -95,6 +95,9 @@ INCLUDES = \

   -I$(top_srcdir)/src/auxil

+# build helpers first

+all-local: mkrot genruns

+

 # ADDED STUFF

 generated_genruns_coordtab.c: genruns

@@ -109,6 +109,9 @@ generated_mkrot_rot.s: mkrot

 generated_mkrot_pivotoff.h: mkrot

 	./mkrot

+generated_mkrot_rotcode.h: mkrot

+	./mkrot

+

 generated_mkrot_rotoffs.h: mkrot

 	./mkrot