Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Gautam Chitnis
web-ui-redesign
Commits
d9474d27
Commit
d9474d27
authored
Jul 14, 2006
by
Jean-Paul Saman
Browse files
Remove double .gnutls from HAVE_WIN32 and UNIX targets
parent
43f4d03d
Changes
1
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/Makefile
View file @
d9474d27
...
...
@@ -166,7 +166,7 @@ else
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss
\
.live .goom2k4 .caca .mod .x264 .xml .twolame
\
.png .gpg-error .gcrypt .gnutls .mpcdec
\
.gnutls
.dvdnav .dvbpsi .wxwidgets .dirac
\
.dvdnav .dvbpsi .wxwidgets .dirac
\
.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
# .SDL_image .daap .cddb .cdio .vcdimager .portaudio
else
...
...
@@ -182,7 +182,7 @@ else
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss
\
.live .goom2k4 .caca .mod .x264 .xml .twolame
\
.png .gpg-error .gcrypt .gnutls .mpcdec
\
.gnutls
.dvdnav .dvbpsi .wxwidgets .dirac
\
.dvdnav .dvbpsi .wxwidgets .dirac
\
.aclocal .libdca
# .SDL_image .daap .cddb .cdio .vcdimager
endif
...
...
@@ -1410,6 +1410,7 @@ ifdef HAVE_WIN32
else
(
cat
Patches/libpng-osx.patch |
sed
-e
's%??PREFIX??%
$(PREFIX)
%'
-e
's%??EXTRA_CFLAGS??%
$(EXTRA_CFLAGS)
%'
-e
's%??EXTRA_LDFLAGS??%
$(EXTRA_LDFLAGS)
%'
| patch
-p0
)
endif
(
patch
-p
0 < Patches/libpng-1.2.8-makefile.patch
)
.png
:
libpng
ifdef
HAVE_DARWIN_OS
...
...
@@ -1417,8 +1418,12 @@ ifdef HAVE_DARWIN_OS
else
ifdef
HAVE_WIN32
(
cd
$<
;
rm
-f
INSTALL
;
cp
scripts/makefile.cygwin Makefile
&&
make
$(HOSTCC)
&&
make install-static
)
else
ifeq
($(PNG_VERSION),1.2.8)
(
cd
$<
;
PREFIX
=
$(PREFIX)
DESTDIR
=
$(PREFIX)
cp
scripts/makefile.linux Makefile
&&
make
&&
make
install
)
else
(
cd
$<
;
$(HOSTCC)
./configure
$(HOSTCONF)
--prefix
=
$(PREFIX)
&&
make
&&
make
install
)
endif
endif
$(INSTALL_NAME)
endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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