diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 01:04:52 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 01:04:52 +0000 |
| commit | 9cdac5be795dbc7701b57f03969a174750b1415e (patch) | |
| tree | c94635d31bd854b73d62d523055f1727843d8c40 /win32 | |
| parent | cce53128f0dd05550ad5ef0f7dae6db1db93d97c (diff) | |
| parent | ed50aae86ce8fd29842df53ee83e0b1d4cddb828 (diff) | |
| download | xine-lib-9cdac5be795dbc7701b57f03969a174750b1415e.tar.gz xine-lib-9cdac5be795dbc7701b57f03969a174750b1415e.tar.bz2 | |
Merge.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.am | 13 | ||||
| -rw-r--r-- | win32/include/Makefile.am | 14 |
2 files changed, 11 insertions, 16 deletions
diff --git a/win32/Makefile.am b/win32/Makefile.am index 934ddb81a..6f8795b5c 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,10 +1,19 @@ include $(top_srcdir)/misc/Makefile.common -SUBDIRS = include - EXTRA_DIST = \ scripts/post_install.bat \ scripts/ffmpeg_win32.patch \ + include/msvc/sys/time.h \ + include/msvc/config.h \ + include/msvc/inttypes.h \ + include/msvc/stdint.h \ + include/msvc/unistd.h \ + include/sys/socket.h \ + include/netinet/in.h \ + include/sys/socket.h \ + include/dlfcn.h \ + include/netdb.h \ + include/pwd.h \ config.h \ README \ libdvdnav.def \ diff --git a/win32/include/Makefile.am b/win32/include/Makefile.am deleted file mode 100644 index e7f124586..000000000 --- a/win32/include/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -EXTRA_DIST = \ - msvc/sys/time.h \ - msvc/config.h \ - msvc/inttypes.h \ - msvc/stdint.h \ - msvc/unistd.h \ - sys/socket.h \ - netinet/in.h \ - sys/socket.h \ - dlfcn.h \ - netdb.h \ - pwd.h |