diff options
author | Emil Velikov <[email protected]> | 2014-04-01 02:34:08 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-04-05 13:00:02 +0100 |
commit | ba5eba500884c85792b3de38c90a70b4b11dc432 (patch) | |
tree | 02ce60a3435a1bf19b30224546ef5bf4b0bd37af /src/gallium/targets | |
parent | 16c13aaeb87b296a60fd0898efc20984faf67565 (diff) |
automake: introduce GALLIUM_COMMON_LIB_DEPS
Rather than copying the core four dependencies all over gallium,
introduce the above variable to avoid all the duplication.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76848
Tested-by: Vinson Lee <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 10 | ||||
-rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 5 | ||||
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 5 | ||||
-rw-r--r-- | src/gallium/targets/xa/Makefile.am | 6 |
4 files changed, 5 insertions, 21 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 58ecf697ce9..a133cd1b6c1 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -69,10 +69,7 @@ egl_gallium_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/egl/libegl.la \ $(top_builddir)/src/egl/main/libEGL.la \ $(top_builddir)/src/loader/libloader.la \ - $(CLOCK_LIB) \ - $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) \ - -lm + $(GALLIUM_COMMON_LIB_DEPS) if HAVE_MESA_LLVM AM_LDFLAGS += $(LLVM_LDFLAGS) @@ -139,10 +136,7 @@ st_GL_la_LIBADD = \ $(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(CLOCK_LIB) \ - $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) \ - -lm + $(GALLIUM_COMMON_LIB_DEPS) endif endif diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 22b4826391e..b659ac43642 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -49,10 +49,7 @@ gbm_gallium_drm_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(LIBDRM_LIBS) \ - -lm \ - $(CLOCK_LIB) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) + $(GALLIUM_COMMON_LIB_DEPS) if HAVE_DRI gbm_gallium_drm_la_LIBADD += \ diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index fa463addcc5..a35ef358a50 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -40,10 +40,7 @@ PIPE_LIBS = \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ - -lm \ - $(CLOCK_LIB) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) + $(GALLIUM_COMMON_LIB_DEPS) AM_LDFLAGS = \ -module \ diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 21f29cfa65e..3c0caf97a18 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -46,11 +46,7 @@ libxatracker_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(LIBDRM_LIBS) \ - -lm \ - $(CLOCK_LIB) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - + $(GALLIUM_COMMON_LIB_DEPS) if HAVE_DRI libxatracker_la_LIBADD += \ |