Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
6f924598
Commit
6f924598
authored
Jan 17, 2005
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Added the contrib system to MAKE_DIST
* cleaned up some alignment in configure --help
parent
db7ad6de
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
11 deletions
+47
-11
Makefile.am
Makefile.am
+1
-0
configure.ac
configure.ac
+11
-11
toolbox
toolbox
+35
-0
No files found.
Makefile.am
View file @
6f924598
...
@@ -247,6 +247,7 @@ EXTRA_DIST += \
...
@@ -247,6 +247,7 @@ EXTRA_DIST += \
dist-hook
:
dist-hook
:
cp
$(distdir)
/vlc.ebuild
$(distdir)
/vlc-
${VERSION}
.ebuild
cp
$(distdir)
/vlc.ebuild
$(distdir)
/vlc-
${VERSION}
.ebuild
cd
$(distdir)
&&
srcdir
=
$(srcdir)
$(srcdir)
/toolbox
--update-vc
cd
$(distdir)
&&
srcdir
=
$(srcdir)
$(srcdir)
/toolbox
--update-vc
distdir
=
$(distdir)
srcdir
=
$(srcdir)
$(srcdir)
/toolbox
--dist-contrib
###############################################################################
###############################################################################
# Building libvlc
# Building libvlc
...
...
configure.ac
View file @
6f924598
...
@@ -1858,22 +1858,22 @@ then
...
@@ -1858,22 +1858,22 @@ then
VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
else
else
AC_ARG_WITH(ffmpeg-mp3lame,
AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame
if ffmpeg has been compiled with mp3lame support],
[ --with-ffmpeg-mp3lame
specify
if ffmpeg has been compiled with mp3lame support],
[
[
VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_ARG_WITH(ffmpeg-faac,
AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac
if ffmpeg has been compiled with faac support],
[ --with-ffmpeg-faac
specify
if ffmpeg has been compiled with faac support],
[
[
VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
AC_ARG_WITH(ffmpeg-dts,
AC_ARG_WITH(ffmpeg-dts,
[ --with-ffmpeg-dts if ffmpeg has been compiled with dts support],
[ --with-ffmpeg-dts
specify
if ffmpeg has been compiled with dts support],
[
[
VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
AC_ARG_WITH(ffmpeg-zlib,
AC_ARG_WITH(ffmpeg-zlib,
[ --with-ffmpeg-zlib if ffmpeg has been compiled with zlib support],
[ --with-ffmpeg-zlib
specify
if ffmpeg has been compiled with zlib support],
[
[
VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
...
...
toolbox
View file @
6f924598
...
@@ -29,6 +29,7 @@ recognized flags are:
...
@@ -29,6 +29,7 @@ recognized flags are:
--update-glade2 generate and fix Glade 2 code
--update-glade2 generate and fix Glade 2 code
--update-flexml generate and fix flexml and flex code
--update-flexml generate and fix flexml and flex code
--distclean "make distclean" on steroids
--distclean "make distclean" on steroids
--dist-contrib add the contrib dir to MAKE_DIST
--make-woody <dir> change distdir <dir> to a woody distdir
--make-woody <dir> change distdir <dir> to a woody distdir
EOF
EOF
exit
1
exit
1
...
@@ -85,6 +86,9 @@ case "$1" in
...
@@ -85,6 +86,9 @@ case "$1" in
--add-include
)
--add-include
)
action
=
include
action
=
include
;;
;;
--dist-contrib
)
action
=
contrib
;;
--help
)
--help
)
help
help
;;
;;
...
@@ -578,6 +582,37 @@ then
...
@@ -578,6 +582,37 @@ then
# FIXME: a lot of Makefiles are still there
# FIXME: a lot of Makefiles are still there
fi
fi
##
## Add the extras/contrib dir to the distribution
##
if
test
"
${
action
}
"
=
"contrib"
then
set
-x
if
test
!
-d
"
${
distdir
}
/extras"
then
mkdir
"
${
distdir
}
/extras"
fi
if
test
!
-d
"
${
distdir
}
/extras/contrib"
then
mkdir
"
${
distdir
}
/extras/contrib"
fi
cp
"
${
srcdir
}
/extras/contrib/Makefile"
"
${
distdir
}
/extras/contrib/Makefile"
cp
"
${
srcdir
}
/extras/contrib/README"
"
${
distdir
}
/extras/contrib/README"
cp
"
${
srcdir
}
/extras/contrib/bootstrap"
"
${
distdir
}
/extras/contrib/bootstrap"
cp
"
${
srcdir
}
/extras/contrib/change_prefix.sh"
"
${
distdir
}
/extras/contrib/change_prefix.sh"
if
test
!
-d
"
${
distdir
}
/extras/contrib/src"
then
mkdir
"
${
distdir
}
/extras/contrib/src"
fi
cp
"
${
srcdir
}
/extras/contrib/src/Makefile"
"
${
distdir
}
/extras/contrib/src/Makefile"
cp
"
${
srcdir
}
/extras/contrib/src/packages.mak"
"
${
distdir
}
/extras/contrib/src/packages.mak"
if
test
!
-d
"
${
distdir
}
/extras/contrib/src/Patches"
then
mkdir
"
${
distdir
}
/extras/contrib/src/Patches"
fi
cp
${
srcdir
}
/extras/contrib/src/Patches/
*
"
${
distdir
}
/extras/contrib/src/Patches/"
fi
##
##
## Build a woody-friendly package
## Build a woody-friendly package
##
##
...
...
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