Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
47eb2200
Commit
47eb2200
authored
Sep 11, 2006
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* No longer use the $(pic) variable, since all flags are properly set
in the configure script.
parent
0ca651f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
bootstrap
bootstrap
+3
-3
mozilla/Makefile.am
mozilla/Makefile.am
+4
-4
src/Makefile.am
src/Makefile.am
+4
-4
No files found.
bootstrap
View file @
47eb2200
...
...
@@ -393,9 +393,9 @@ nodist_lib${mod}_builtin_la_SOURCES = \$(nodist_SOURCES_${mod})
EOF
fi
cat
>>
"
${
makf
}
"
<<
EOF
lib
${
mod
}
_a_CFLAGS =
\`\$
(VLC_CONFIG) --cflags builtin
\$
(
pic
)
${
mod
}
\`
lib
${
mod
}
_a_CXXFLAGS =
\`\$
(VLC_CONFIG) --cxxflags builtin
\$
(
pic
)
${
mod
}
\`
lib
${
mod
}
_a_OBJCFLAGS =
\`\$
(VLC_CONFIG) --objcflags builtin
\$
(
pic
)
${
mod
}
\`
lib
${
mod
}
_a_CFLAGS =
\`\$
(VLC_CONFIG) --cflags builtin pic
${
mod
}
\`
lib
${
mod
}
_a_CXXFLAGS =
\`\$
(VLC_CONFIG) --cxxflags builtin pic
${
mod
}
\`
lib
${
mod
}
_a_OBJCFLAGS =
\`\$
(VLC_CONFIG) --objcflags builtin pic
${
mod
}
\`
lib
${
mod
}
_builtin_la_CFLAGS =
\`\$
(VLC_CONFIG) --cflags builtin
${
mod
}
\`
lib
${
mod
}
_builtin_la_CXXFLAGS =
\`\$
(VLC_CONFIG) --cxxflags builtin
${
mod
}
\`
lib
${
mod
}
_builtin_la_OBJCFLAGS =
\`\$
(VLC_CONFIG) --objcflags builtin
${
mod
}
\`
...
...
mozilla/Makefile.am
View file @
47eb2200
...
...
@@ -165,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
...
...
@@ -182,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
;
\
...
...
src/Makefile.am
View file @
47eb2200
...
...
@@ -149,9 +149,9 @@ endif
###############################################################################
libvlc_a_SOURCES
=
$(SOURCES_libvlc)
libvlc_a_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
vlc
$(
pic
)
`
libvlc_a_CXXFLAGS
=
`
$(VLC_CONFIG)
--cxxflags
vlc
$(
pic
)
`
libvlc_a_OBJCFLAGS
=
`
$(VLC_CONFIG)
--objcflags
vlc
$(
pic
)
`
libvlc_a_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
vlc pic
`
libvlc_a_CXXFLAGS
=
`
$(VLC_CONFIG)
--cxxflags
vlc pic
`
libvlc_a_OBJCFLAGS
=
`
$(VLC_CONFIG)
--objcflags
vlc pic
`
libvlc_la_SOURCES
=
$(SOURCES_libvlc)
libvlc_la_LIBADD
=
$(INCLUDED_LIBINTL)
...
...
@@ -203,7 +203,7 @@ libvlc.dll.a: libvlc$(LIBEXT)
$(DLLTOOL)
--export-all-symbols
-l
$@
-D
$<
$(libvlc_a_OBJECTS)
libvlc$(LIBEXT)
:
$(OBJECTS_libvlc_so) stamp-builtins
@
ldfl
=
"
`
$(VLC_CONFIG)
--libs
plugin vlc
builtin
$(
pic
)
`
$(INCLUDED_LIBINTL)
"
;
\
@
ldfl
=
"
`
$(VLC_CONFIG)
--libs
plugin vlc
builtin
pic
`
$(INCLUDED_LIBINTL)
"
;
\
case
`
$(VLC_CONFIG)
--linkage
vlc
builtin
`
in
\
c++
)
ld
=
"
$(CXXLINK)
"
;;
\
objc
)
ld
=
"
$(OBJCLINK)
"
;;
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment