#5231: Fixup the configure and makefiles

codereader · May 3, 2020 · 93105d5 · 93105d5
1 parent 06570a5
commit 93105d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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