Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
83b35c64
Commit
83b35c64
authored
Aug 23, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the executables out of src/
parent
9715ca47
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
49 additions
and
57 deletions
+49
-57
Makefile.am
Makefile.am
+7
-4
bin/Makefile.am
bin/Makefile.am
+41
-0
bin/rootwrap.c
bin/rootwrap.c
+0
-0
bin/vlc.c
bin/vlc.c
+0
-0
bin/winvlc.c
bin/winvlc.c
+0
-0
configure.ac
configure.ac
+1
-0
src/Makefile.am
src/Makefile.am
+0
-53
No files found.
Makefile.am
View file @
83b35c64
...
...
@@ -7,7 +7,7 @@
# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
BASE_SUBDIRS
=
po src modules share doc
test
BASE_SUBDIRS
=
po src
bin
modules share doc
test
EXTRA_SUBDIRS
=
m4 extras/package/ipkg
\
libs/loader libs/srtp
\
projects/mozilla projects/activex
...
...
@@ -20,6 +20,9 @@ endif
if
HAVE_LIBGCRYPT
SUBDIRS
+=
libs/srtp
endif
if
BUILD_VLC
SUBDIRS
+=
bin
endif
SUBDIRS
+=
modules share doc
test
if
BUILD_MOZILLA
SUBDIRS
+=
projects/mozilla
...
...
@@ -313,8 +316,8 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
libvlc
:
cd
src
&&
$(MAKE)
$(AM_MAKEFLAGS)
libvlccore.la
core
:
cd
src
&&
$(MAKE)
$(AM_MAKEFLAGS)
vlc
$(EXEEXT)
core
:
libvlc
cd
bin
&&
$(MAKE)
$(AM_MAKEFLAGS)
vlc
$(EXEEXT)
doc
:
cd
doc
&&
$(MAKE)
$(AM_MAKEFLAGS)
doc
...
...
@@ -389,7 +392,7 @@ endif
vlc$(EXEEXT)
:
Makefile.am
rm
-f
--
vlc vlc.tmp
echo
'#! /bin/sh'
>
vlc.tmp
echo
'exec "$$(dirname "$$0")/
src
/vlc
$(EXEEXT)
" "--plugin-path=$$(dirname "$$0")/modules" "$$@"'
>>
vlc.tmp
echo
'exec "$$(dirname "$$0")/
bin
/vlc
$(EXEEXT)
" "--plugin-path=$$(dirname "$$0")/modules" "$$@"'
>>
vlc.tmp
chmod
+x vlc.tmp
mv
-f
--
vlc.tmp vlc
...
...
bin/Makefile.am
0 → 100644
View file @
83b35c64
# Building vlc
#
bin_PROGRAMS
=
vlc
EXTRA_PROGRAMS
=
vlc-wrapper
if
!HAVE_WIN32
bin_PROGRAMS
+=
vlc-wrapper
endif
EXTRA_vlc_SOURCES
=
vlc.c winvlc.c
if
!HAVE_WIN32
vlc_SOURCES
=
vlc.c
else
vlc_SOURCES
=
winvlc.c
endif
vlc_wrapper_SOURCES
=
rootwrap.c
vlc_DEPENDENCIES
=
$(DATA_win32_rc)
../src/libvlc.la
vlc_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
vlc
`
vlc_LDFLAGS
=
`
$(VLC_CONFIG)
--ldflags
vlc
`
# vlc needs libvlccore for locale conversion
vlc_LDADD
=
../src/libvlc.la ../src/libvlccore.la
$(LTLIBINTL)
\
`
$(VLC_CONFIG)
-libs
vlc
`
#vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
# $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)
DATA_win32_rc
=
vlc_win32_rc.
$(OBJEXT)
DATA_win32_rc_lib
=
libvlc_win32_rc.
$(OBJEXT)
EXTRA_DATA
=
$(DATA_win32_rc)
$(DATA_win32_rc_lib)
if
HAVE_WIN32
vlc_LDADD
+=
$(DATA_win32_rc)
noinst_DATA
=
$(DATA_win32_rc)
$(DATA_win32_rc_lib)
endif
vlc_win32_rc.$(OBJEXT)
:
$(top_builddir)/share/vlc_win32_rc.rc
$(WINDRES)
--include-dir
$(top_srcdir)
/share
-i
$<
-o
$@
libvlc_win32_rc.$(OBJEXT)
:
$(top_builddir)/share/libvlc_win32_rc.rc
$(WINDRES)
--include-dir
$(top_srcdir)
/share
-i
$<
-o
$@
src/network
/rootwrap.c
→
bin
/rootwrap.c
View file @
83b35c64
File moved
src
/vlc.c
→
bin
/vlc.c
View file @
83b35c64
File moved
src
/winvlc.c
→
bin
/winvlc.c
View file @
83b35c64
File moved
configure.ac
View file @
83b35c64
...
...
@@ -5861,6 +5861,7 @@ AC_CONFIG_FILES([
share/libvlc_win32_rc.rc
src/Makefile
src/test/Makefile
bin/Makefile
test/Makefile
])
...
...
src/Makefile.am
View file @
83b35c64
...
...
@@ -438,59 +438,6 @@ misc/revision.c:
mv
-f
$@
.tmp
$@
###############################################################################
# Building vlc
###############################################################################
EXTRA_PROGRAMS
=
vlc vlc-wrapper
if
BUILD_VLC
bin_PROGRAMS
=
vlc
if
!HAVE_WIN32
bin_PROGRAMS
+=
vlc-wrapper
endif
endif
EXTRA_vlc_SOURCES
=
vlc.c winvlc.c
if
!HAVE_WIN32
vlc_SOURCES
=
vlc.c
else
vlc_SOURCES
=
winvlc.c
endif
vlc_wrapper_SOURCES
=
network/rootwrap.c
vlc_DEPENDENCIES
=
$(DATA_win32_rc)
libvlc.la
vlc_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
vlc
`
vlc_LDFLAGS
=
`
$(VLC_CONFIG)
--ldflags
vlc
`
# vlc needs libvlccore for locale conversion
vlc_LDADD
=
$(DATA_win32_rc)
libvlc.la libvlccore.la
$(LTLIBINTL)
\
`
$(VLC_CONFIG)
-libs
vlc
`
if
BUILD_VLC
vlc$(EXEEXT)
:
$(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@
rm
-f
vlc
$(EXEEXT)
@
case
`
$(VLC_CONFIG)
--linkage
vlc
builtin
`
in
\
c++
)
cmd
=
"
$(CXXLINK)
"
;;
\
objc
)
cmd
=
"
$(OBJCLINK)
"
;;
\
c|
*
)
cmd
=
"
$(LINK)
"
;;
\
esac
;
\
cmd
=
"
$$
cmd
$(vlc_OBJECTS)
$(vlc_LDADD)
$(vlc_LDFLAGS)
"
;
\
echo
$$
cmd
;
\
eval
$$
cmd
if
HAVE_WIN32
DATA_win32_rc
=
vlc_win32_rc.
$(OBJEXT)
DATA_win32_rc_lib
=
libvlc_win32_rc.
$(OBJEXT)
noinst_DATA
=
$(DATA_win32_rc)
$(DATA_win32_rc_lib)
vlc_win32_rc.$(OBJEXT)
:
$(top_builddir)/share/vlc_win32_rc.rc
$(WINDRES)
--include-dir
$(top_srcdir)
/share
-i
$<
-o
$@
libvlc_win32_rc.$(OBJEXT)
:
$(top_builddir)/share/libvlc_win32_rc.rc
$(WINDRES)
--include-dir
$(top_srcdir)
/share
-i
$<
-o
$@
endif
endif
###############################################################################
# Unit/regression test
###############################################################################
...
...
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