Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
libdvdread
Commits
bb36d730
Commit
bb36d730
authored
Aug 31, 2008
by
Dominik Mierzejewski
Browse files
Fix parallel make builds and set proper dependencies
on generated files.
parent
ea30d9c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
bb36d730
...
...
@@ -73,14 +73,11 @@ $(SRCS) $(DVDREAD_SRCS): version.h
# General targets
$(.OBJDIR)
:
mkdir
$
(
.OBJDIR
)
${DVDREAD_LIB}
:
version.h $(.OBJDIR) $(DVDREAD_OBJS) $(BUILDDEPS)
${DVDREAD_LIB}
:
version.h $(DVDREAD_OBJS) $(BUILDDEPS)
cd
$
(
.OBJDIR
)
&&
$(AR)
rc
$@
$(DVDREAD_OBJS)
cd
$
(
.OBJDIR
)
&&
$(RANLIB)
$@
${DVDREAD_SHLIB}
:
version.h
$(.OBJDIR)
$(DVDREAD_SHOBJS) $(BUILDDEPS)
${DVDREAD_SHLIB}
:
version.h $(DVDREAD_SHOBJS) $(BUILDDEPS)
cd
$
(
.OBJDIR
)
&&
$(CC)
$(SHLDFLAGS)
$(LDFLAGS)
-ldl
-Wl
,-soname
=
$(DVDREAD_SHLIB)
.
$(SHLIB_MAJOR)
-o
$@
$(DVDREAD_SHOBJS)
.c.so
:
$(BUILDDEPS)
...
...
@@ -124,14 +121,15 @@ install-static: $(LIB)
# Clean targets
clean
:
rm
-rf
*
~
$
(
.OBJDIR
)
version.h
rm
-rf
*
~
$
(
.OBJDIR
)
/
*
version.h
distclean
:
clean
find
.
-name
"*~"
| xargs
rm
-rf
rm
-rf
config.mak
rm
-rf
config.mak
$
(
.OBJDIR
)
dvdread-config
:
$(.OBJDIR)
dvdread-config
:
$(.OBJDIR)/dvdread-config
$(.OBJDIR)/dvdread-config
:
$(BUILDDEPS)
@
echo
'#!/bin/sh'
>
$
(
.OBJDIR
)
/dvdread-config
@
echo
'prefix='
$(PREFIX)
>>
$
(
.OBJDIR
)
/dvdread-config
@
echo
'libdir='
$(shlibdir)
>>
$
(
.OBJDIR
)
/dvdread-config
...
...
@@ -152,7 +150,7 @@ pcedit = sed \
-e
's,@VERSION@,
$(SHLIB_VERSION)
,'
pkgconfig
:
$(.OBJDIR)/dvdread.pc
$(.OBJDIR)/dvdread.pc
:
misc/dvdread.pc.in $(
.OBJDIR
)
$(.OBJDIR)/dvdread.pc
:
misc/dvdread.pc.in $(
BUILDDEPS
)
$(pcedit)
$<
>
$@
install-pkgconfig
:
$(.OBJDIR)/dvdread.pc
...
...
configure2
View file @
bb36d730
...
...
@@ -148,6 +148,8 @@ if test "$source_path_used" != "no"; then
done
fi
[
-d
obj
]
||
mkdir
-p
obj
echo
echo
"Done, type 'make install' to build and install"
Write
Preview
Supports
Markdown
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