From 468925a60e741825bf541d670bfd7d691f2aa92d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Sat, 24 Apr 2010 16:20:51 +0200 Subject: [PATCH] * simplify a bit the Makefiles --- hkl3d/Makefile.am | 18 ++++++++++-------- test/Makefile.am | 6 ------ test/gui/DiffabsDemo/Makefile.am | 14 +++++--------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/hkl3d/Makefile.am b/hkl3d/Makefile.am index e436fc5..dabde73 100644 --- a/hkl3d/Makefile.am +++ b/hkl3d/Makefile.am @@ -9,14 +9,7 @@ AM_CXXFLAGS = \ AM_LDFLAGS = -version-info 0:0:0 \ $(HKL_LIBS) \ - $(G3D_LIBS) \ - $(top_builddir)/hkl3d/bullet/src/libbulletmath.la \ - $(top_builddir)/hkl3d/bullet/src/libbulletcollision.la - -if CONDITIONAL_BUILD_MULTITHREADED -AM_CXXFLAGS += -DUSE_PARALLEL_DISPATCHER=1 -AM_LDFLAGS += $(top_builddir)/hkl3d/bullet/src/libbulletmultithreaded.la -endif + $(G3D_LIBS) lib_LTLIBRARIES = \ libhkl3d.la @@ -25,6 +18,15 @@ libhkl3d_la_SOURCES = \ hkl3d.h \ hkl3d.cpp +libhkl3d_la_LIBADD = \ + $(top_builddir)/hkl3d/bullet/src/libbulletmath.la \ + $(top_builddir)/hkl3d/bullet/src/libbulletcollision.la + +if CONDITIONAL_BUILD_MULTITHREADED +AM_CXXFLAGS += -DUSE_PARALLEL_DISPATCHER=1 +libhkl3d_la_LIBADD += $(top_builddir)/hkl3d/bullet/src/libbulletmultithreaded.la +endif + # Support for GNU Flymake, in Emacs. check-syntax: AM_CXXFLAGS += -fsyntax-only -pipe check-syntax: diff --git a/test/Makefile.am b/test/Makefile.am index 0207d11..ee79e91 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -5,16 +5,10 @@ TESTS = $(check_PROGRAMS) check_PROGRAMS = test AM_LDFLAGS = \ - $(top_builddir)/hkl3d/bullet/src/libbulletmath.la \ - $(top_builddir)/hkl3d/bullet/src/libbulletcollision.la \ $(top_builddir)/hkl3d/bullet/src/libbulletdynamics.la \ $(top_builddir)/hkl3d/libhkl3d.la \ $(HKL_LIBS) -if CONDITIONAL_BUILD_MULTITHREADED -AM_LDFLAGS += $(top_builddir)/hkl3d/bullet/src/libbulletmultithreaded.la -endif - AM_CXXFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/hkl3d \ diff --git a/test/gui/DiffabsDemo/Makefile.am b/test/gui/DiffabsDemo/Makefile.am index c15e7fe..0c50519 100644 --- a/test/gui/DiffabsDemo/Makefile.am +++ b/test/gui/DiffabsDemo/Makefile.am @@ -8,20 +8,11 @@ AM_CXXFLAGS = \ $(GLU_CFLAGS) AM_LDFLAGS = \ - $(top_builddir)/hkl3d/libhkl3d.la \ - $(top_builddir)/hkl3d/bullet/src/libbulletmath.la \ - $(top_builddir)/hkl3d/bullet/src/libbulletcollision.la \ - $(top_builddir)/hkl3d/bullet/src/libbulletdynamics.la \ - -L$(top_builddir)/test/gui/OpenGL -lbulletopenglsupport \ $(G3D_LIBS) \ $(HKL_LIBS) \ $(GLU_LIBS) \ -lglut -if CONDITIONAL_BUILD_MULTITHREADED -AM_LDFLAGS += $(top_builddir)/hkl3d/bullet/src/libbulletmultithreaded.la -endif - noinst_PROGRAMS = DiffabsDemo DiffabsDemo_SOURCES = \ @@ -29,6 +20,11 @@ DiffabsDemo_SOURCES = \ DiffabsDemo.h \ main.cpp +DiffabsDemo_LDADD = \ + $(top_builddir)/hkl3d/libhkl3d.la \ + $(top_builddir)/hkl3d/bullet/src/libbulletdynamics.la \ + $(top_builddir)/test/gui/OpenGL/libbulletopenglsupport.a + # Support for GNU Flymake, in Emacs. check-syntax: AM_CXXFLAGS += -fsyntax-only -pipe check-syntax: -- 2.11.4.GIT