diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-07-01 23:02:05 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-07-01 23:02:05 +0000 |
| commit | 2aba2456be6e9d7c4adaa0aaa7b0b7aba48cd3a0 (patch) | |
| tree | c5b4d6b35cd00ccb52d5eb06d0fbba2780833aeb | |
| parent | e0768bd727a14d9219de4f2445e9db404ceade95 (diff) | |
| download | xine-lib-2aba2456be6e9d7c4adaa0aaa7b0b7aba48cd3a0.tar.gz xine-lib-2aba2456be6e9d7c4adaa0aaa7b0b7aba48cd3a0.tar.bz2 | |
Link libxineutils to thread lib (xine-mutex introduced that). Thanks to
Vaclav Slavik <vaclav.slavik@matfyz.cz> for the notice and a patch.
Add thread cflags in debug CFLAGS (xine-engine).
CVS patchset: 2194
CVS date: 2002/07/01 23:02:05
| -rw-r--r-- | src/xine-engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 8093aaa74..0180cc3d6 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = bswap.h nvtvd.h @INCLUDED_INTL_TRUE@ @cd $(top_builddir)/intl && $(MAKE) libintl.la debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\\\"file://@XINE_SKINPATH@/xine_logo.mpv\\\"" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\\\"file://@XINE_SKINPATH@/xine_logo.mpv\\\"" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index de0715385..0ecbfe8ab 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -10,8 +10,10 @@ if PPC_ARCH pppc_files = ppcasm_string.S endif -libxineutils_la_SOURCES = $(pppc_files) utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c xmllexer.c xmlparser.c +CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) +libxineutils_la_SOURCES = $(pppc_files) utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c xmllexer.c xmlparser.c +libxineutils_la_LIBADD = $(THREAD_LIBS) libxineutils_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @@ -19,7 +21,7 @@ libxineutils_la_LDFLAGS = \ include_HEADERS = xineutils.h attributes.h compat.h xmllexer.h xmlparser.h ppcasm_string.h debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS)" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |