isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-25 03:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Use libtool macros to find libm

Browse Source 
Instead of using `-lm` everywhere, use LT_LIB_M inside configure.ac, and
$(LIBM) inside Makefile.am.
This commit is contained in:
Emmanuele Bassi 2015-03-03 17:23:37 +00:00
parent 4591435c35
commit df15f04fc0
8 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/Makefile.am
View File

@ -837,26 +837,15 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files) pkgconfig_DATA = $(pc_files)
DISTCLEANFILES += $(pc_files) DISTCLEANFILES += $(pc_files)
clutter_include_HEADERS = \ clutter_include_HEADERS = $(source_h) clutter.h clutter-version.h
$(source_h) \ nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
clutter.h \
clutter-version.h
nodist_clutter_include_HEADERS = \
clutter-config.h \
$(built_source_h)
clutter_deprecated_HEADERS = $(deprecated_h) clutter_deprecated_HEADERS = $(deprecated_h)
lib_LTLIBRARIES += libclutter-@CLUTTER_API_VERSION@.la lib_LTLIBRARIES += libclutter-@CLUTTER_API_VERSION@.la
libclutter_@CLUTTER_API_VERSION@_la_LIBADD = \ libclutter_@CLUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(CLUTTER_LIBS) $(CLUTTER_PROFILE_LIBS)
-lm \ libclutter_@CLUTTER_API_VERSION@_la_DEPENDENCIES = $(win32_resources)
$(CLUTTER_LIBS) \
$(CLUTTER_PROFILE_LIBS)
libclutter_@CLUTTER_API_VERSION@_la_DEPENDENCIES = \
$(win32_resources)
libclutter_@CLUTTER_API_VERSION@_la_SOURCES = \ libclutter_@CLUTTER_API_VERSION@_la_SOURCES = \
$(backend_source_c) \ $(backend_source_c) \

1
configure.ac
View File

@ -130,6 +130,7 @@ AM_PROG_CC_C_O
# require libtool >= 2.2 # require libtool >= 2.2
LT_PREREQ([2.2.6]) LT_PREREQ([2.2.6])
LT_INIT([disable-static]) LT_INIT([disable-static])
LT_LIB_M
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC

2
doc/cookbook/examples/Makefile.am
View File

@ -56,7 +56,7 @@ all_examples = \
events-buttons-lasso \ events-buttons-lasso \
$(NULL) $(NULL)
LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la -lm LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(LIBM)
AM_CFLAGS = $(CLUTTER_CFLAGS) AM_CFLAGS = $(CLUTTER_CFLAGS)

8
examples/Makefile.am
View File

@ -22,14 +22,8 @@ all_examples += \
image-content image-content
endif endif
LDADD = \ LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(LIBM)
$(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la \
$(CLUTTER_LIBS) \
$(GDK_PIXBUF_LIBS) \
-lm
AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS) AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_DISABLE_SINGLE_INCLUDES \ -DG_DISABLE_SINGLE_INCLUDES \
-DGLIB_DISABLE_DEPRECATION_WARNINGS \ -DGLIB_DISABLE_DEPRECATION_WARNINGS \

2
tests/conform/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/build/autotools/glib-tap.mk include $(top_srcdir)/build/autotools/glib-tap.mk
AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
LDADD = $(top_builddir)/clutter/libclutter-1.0.la $(CLUTTER_LIBS) -lm LDADD = $(top_builddir)/clutter/libclutter-1.0.la $(CLUTTER_LIBS) $(LIBM)
AM_LDFLAGS = -export-dynamic AM_LDFLAGS = -export-dynamic
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Clutter-Conform\" \ -DG_LOG_DOMAIN=\"Clutter-Conform\" \

2
tests/interactive/Makefile.am
View File

@ -157,7 +157,7 @@ test_interactive_CPPFLAGS = \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter -I$(top_builddir)/clutter
test_interactive_LDFLAGS = -export-dynamic test_interactive_LDFLAGS = -export-dynamic
test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) -lm test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) $(LIBM)
EXTRA_DIST = \ EXTRA_DIST = \
wrapper.sh.in \ wrapper.sh.in \

2
tests/micro-bench/Makefile.am
View File

@ -22,7 +22,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter -I$(top_builddir)/clutter
LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm LDADD = $(common_ldadd) $(CLUTTER_LIBS) $(LIBM)
test_text_SOURCES = test-text.c test_text_SOURCES = test-text.c
test_picking_SOURCES = test-picking.c test_picking_SOURCES = test-picking.c

2
tests/performance/Makefile.am
View File

@ -11,7 +11,7 @@ check_PROGRAMS = \
common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm LDADD = $(common_ldadd) $(CLUTTER_LIBS) $(LIBM)
AM_CFLAGS = $(CLUTTER_CFLAGS) AM_CFLAGS = $(CLUTTER_CFLAGS)