diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-06-05 12:47:26 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-06-05 12:47:26 +0300 |
| commit | b631217b97e6e63807a2e7195658d12de0236f58 (patch) | |
| tree | b478fb90aedd7925769e8a0b2887c0aa9734786e /src/xine-engine | |
| parent | 4e1f6c532f001e0aebc11738cb1ff2c70a1f4472 (diff) | |
| parent | 8ef238a8cc53fe097808e79de0682b140ff07057 (diff) | |
| download | xine-lib-b631217b97e6e63807a2e7195658d12de0236f58.tar.gz xine-lib-b631217b97e6e63807a2e7195658d12de0236f58.tar.bz2 | |
Merge from 1.1
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 616da19a5..f7a932096 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = lrb.c lrb.h accel_vdpau.h accel_xvmc.h if WIN32 DEF_FILE = libxine-$(XINE_MAJOR).def -def_ldflags=-Wl,--output-def,$(DEF_FILE) $(LDFLAGS_NOUNDEFINED) +def_ldflags=-Wl,--output-def,$(DEF_FILE) else DEF_FILE = endif @@ -45,7 +45,7 @@ libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS) \ $(AVUTIL_LIBS) -libxine_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) $(GCSECTIONS) \ +libxine_la_LDFLAGS = $(LDFLAGS_NOUNDEFINED) $(AM_LDFLAGS) $(def_ldflags) $(GCSECTIONS) \ -weak libxine-interface.la \ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) |