summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-03 10:36:45 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-03 10:36:45 +0000
commitc50e2c8636e6cb83ba223fd56e50845a6c37f7b1 (patch)
tree44654d9ee51816594776ac40f497315fdc0c9a10
parent2ea83c999e25f0467cf7e6c65cb0136d229716e1 (diff)
downloadmpv-c50e2c8636e6cb83ba223fd56e50845a6c37f7b1.tar.bz2
mpv-c50e2c8636e6cb83ba223fd56e50845a6c37f7b1.tar.xz
Move the rest of the config.h parameters to the Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20626 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdvdkit2/Makefile3
-rw-r--r--libmpdvdkit2/config.h8
2 files changed, 2 insertions, 9 deletions
diff --git a/libmpdvdkit2/Makefile b/libmpdvdkit2/Makefile
index f6900d99dc..89d4ab7eb4 100644
--- a/libmpdvdkit2/Makefile
+++ b/libmpdvdkit2/Makefile
@@ -34,10 +34,11 @@ endif
# \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
# -funroll-loops removed, triggered gcc 3.0.4 (3.x?) bug
-CFLAGS= -I. $(OPTFLAGS) \
+CFLAGS= -I.. $(OPTFLAGS) \
-DSYS_LINUX -D__USE_UNIX98 -D_REENTRANT -D_GNU_SOURCE \
-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
-DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
+ -DVERSION=\"1.2.9\"
ifeq ($(TARGET_OS),CYGWIN)
CFLAGS+=-DSYS_CYGWIN -DWIN32
diff --git a/libmpdvdkit2/config.h b/libmpdvdkit2/config.h
deleted file mode 100644
index 987f59cdcf..0000000000
--- a/libmpdvdkit2/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-#include "../config.h"
-
-/* Version number of package */
-#define VERSION "1.2.9"