Skip to content

V
vlc-gpu
Commit d9474d27 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Remove double .gnutls from HAVE_WIN32 and UNIX targets

parent 43f4d03d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
extras/contrib/src/Makefile
View file @ d9474d27
...@@ -166,7 +166,7 @@ else ...@@ -166,7 +166,7 @@ else
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame \ .live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.gnutls .dvdnav .dvbpsi .wxwidgets .dirac \ .dvdnav .dvbpsi .wxwidgets .dirac \
.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca .dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
# .SDL_image .daap .cddb .cdio .vcdimager .portaudio # .SDL_image .daap .cddb .cdio .vcdimager .portaudio
else else
...@@ -182,7 +182,7 @@ else ...@@ -182,7 +182,7 @@ else
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame\ .live .goom2k4 .caca .mod .x264 .xml .twolame\
.png .gpg-error .gcrypt .gnutls .mpcdec\ .png .gpg-error .gcrypt .gnutls .mpcdec\
.gnutls .dvdnav .dvbpsi .wxwidgets .dirac \ .dvdnav .dvbpsi .wxwidgets .dirac \
.aclocal .libdca .aclocal .libdca
# .SDL_image .daap .cddb .cdio .vcdimager # .SDL_image .daap .cddb .cdio .vcdimager
endif endif
...@@ -1410,6 +1410,7 @@ ifdef HAVE_WIN32 ...@@ -1410,6 +1410,7 @@ ifdef HAVE_WIN32
else 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) (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 endif
(patch -p 0 < Patches/libpng-1.2.8-makefile.patch)
.png: libpng .png: libpng
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
...@@ -1417,8 +1418,12 @@ ifdef HAVE_DARWIN_OS ...@@ -1417,8 +1418,12 @@ ifdef HAVE_DARWIN_OS
else else
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install-static) (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 else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
endif
endif endif
$(INSTALL_NAME) $(INSTALL_NAME)
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment