diff --git a/configure.ac b/configure.ac index 57c37a4928..df6b2aa6ba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([darkradiant], [2.8.0]) +AC_INIT([darkradiant], [2.9.0]) AM_INIT_AUTOMAKE([subdir-objects]) AM_SILENT_RULES([yes]) @@ -355,11 +355,13 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([install/darkradiant.desktop install/i18n//Makefile.in Makefile radiant/Makefile + radiantcore/Makefile install/i18n/Makefile.in doc/Makefile libs/Makefile libs/wxutil/Makefile libs/math/Makefile + libs/module/Makefile libs/scene/Makefile libs/xmlutil/Makefile plugins/Makefile diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am index be3395cbdd..a2633862ee 100644 --- a/radiantcore/Makefile.am +++ b/radiantcore/Makefile.am @@ -1,7 +1,7 @@ -#pluginsdir = $(pkglibdir)/plugins +coredir = $(pkglibdir)/ core_LTLIBRARIES = core.la -core_CPPFLAGS = -DPKGLIBDIR='"$(pkglibdir)"' \ +core_la_CPPFLAGS = -DPKGLIBDIR='"$(pkglibdir)"' \ -DPKGDATADIR='"$(pkgdatadir)"' \ -DLOCALEDIR='"$(localedir)"' \ -DHTMLDIR='"$(htmldir)"' \ @@ -11,7 +11,7 @@ core_CPPFLAGS = -DPKGLIBDIR='"$(pkglibdir)"' \ $(XML_CFLAGS) \ $(FTGL_CFLAGS) -core_LDADD = $(top_builddir)/libs/scene/libscenegraph.la \ +core_la_LIBADD = $(top_builddir)/libs/scene/libscenegraph.la \ $(top_builddir)/libs/wxutil/libwxutil.la \ $(top_builddir)/libs/xmlutil/libxmlutil.la \ $(top_builddir)/libs/math/libmath.la