From 0ca651f00fca42b6edbd89f9f36bb24e283800d8 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 11 Sep 2006 09:07:58 +0000 Subject: [PATCH] * Don't use PIC on WIN32. --- mozilla/Makefile.am | 14 ++++++++++---- src/Makefile.am | 6 ++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am index 077eeaec33..a53cda2ad8 100644 --- a/mozilla/Makefile.am +++ b/mozilla/Makefile.am @@ -152,6 +152,12 @@ EXTRA_LIBRARIES = libnpvlc.a endif endif +if HAVE_WIN32 +pic = +else +pic = pic +endif + libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` @@ -159,11 +165,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version libvlcplugin_la_LIBADD = ../src/libvlc.la libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) -libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \ +libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \ $(CPPFLAGS_mozilla_EXTRA) -libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ +libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \ $(CPPFLAGS_mozilla_EXTRA) -LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin pic` +LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)` libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc) $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic @@ -176,7 +182,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic # Stamp rules ############################################################################### stamp-pic: - @for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \ + @for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \ if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ rm -f $@; \ break; \ diff --git a/src/Makefile.am b/src/Makefile.am index cb4d8cefb0..286869b38d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -188,6 +188,12 @@ else lib_LIBRARIES = libvlc.a endif +if HAVE_WIN32 +pic = +else +pic = pic +endif + if HAVE_WIN32 if BUILD_SHARED DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a -- GitLab