build: Fix undefined references with slibtool.

linuxmint · Jan 26, 2021 · 0762515 · 0762515
1 parent c10ab2d
commit 0762515
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS=cogl clutter src po doc data
+SUBDIRS=cogl clutter src src/compositor/plugins po doc data
 
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -3,7 +3,7 @@
 
 lib_LTLIBRARIES = libmuffin.la
 
-SUBDIRS=wm-tester tools compositor/plugins
+SUBDIRS=wm-tester tools
 
 NULL =
 

diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
@@ -2,9 +2,9 @@
 pkglibdir=@MUFFIN_PLUGIN_DIR@
 
 AM_CPPFLAGS= \
-  $(WARN_CFLAGS) \
+	$(WARN_CFLAGS) \
 	$(MUFFIN_CFLAGS) \
-  -I$(top_builddir)/src						\
+	-I$(top_builddir)/src						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/cogl						\
 	-I$(top_builddir)/cogl						\
@@ -27,7 +27,10 @@ AM_CPPFLAGS= \
 default_la_CFLAGS   = $(WARN_CFLAGS) -fPIC
 default_la_SOURCES  = default.c
 default_la_LDFLAGS  = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
-default_la_LIBADD   = $(CLUTTER_LIBS)
+default_la_LIBADD   = \
+	$(CLUTTER_LIBS) \
+	$(top_builddir)/src/libmuffin.la \
+	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
 
 pkglib_LTLIBRARIES = default.la