summaryrefslogtreecommitdiff
path: root/v4l2-apps
diff options
context:
space:
mode:
authorhans@localhost.localdomain <hans@localhost.localdomain>2008-08-06 10:41:47 +0200
committerhans@localhost.localdomain <hans@localhost.localdomain>2008-08-06 10:41:47 +0200
commitefcc2c1bf27fed430cbff0603d9d09cb88d1fad4 (patch)
tree578b392026a7e49db25dd8583b498ade3e2007b3 /v4l2-apps
parentd2dbf570f863476560875eda98a939a77984aa40 (diff)
parent970369c4b036ee451d7c5adbe61040ec7060ddfb (diff)
downloadmediapointer-dvb-s2-efcc2c1bf27fed430cbff0603d9d09cb88d1fad4.tar.gz
mediapointer-dvb-s2-efcc2c1bf27fed430cbff0603d9d09cb88d1fad4.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'v4l2-apps')
-rw-r--r--v4l2-apps/lib/libv4l/libv4l1/Makefile4
-rw-r--r--v4l2-apps/lib/libv4l/libv4l2/Makefile4
-rw-r--r--v4l2-apps/lib/libv4l/libv4lconvert/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/v4l2-apps/lib/libv4l/libv4l1/Makefile b/v4l2-apps/lib/libv4l/libv4l1/Makefile
index c92731daa..4efc74010 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/Makefile
+++ b/v4l2-apps/lib/libv4l/libv4l1/Makefile
@@ -1,4 +1,4 @@
-CPPFLAGS = -I../include -I../../../../linux/include
+override CPPFLAGS += -I../include -I../../../../linux/include
CFLAGS := -g -O1
CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes
@@ -17,7 +17,7 @@ else
V4L1_LIB = libv4l1.so
V4L1_OBJS += ../libv4l2/libv4l2.so
TARGETS += $(V4L1COMPAT)
-CPPFLAGS += -fPIC
+override CPPFLAGS += -fPIC
endif
ifeq ($(LIB_RELEASE),)
diff --git a/v4l2-apps/lib/libv4l/libv4l2/Makefile b/v4l2-apps/lib/libv4l/libv4l2/Makefile
index d8ac01c34..ff3cb9ddc 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/Makefile
+++ b/v4l2-apps/lib/libv4l/libv4l2/Makefile
@@ -1,4 +1,4 @@
-CPPFLAGS = -I../include -I../../../../linux/include
+override CPPFLAGS += -I../include -I../../../../linux/include
CFLAGS := -g -O1
CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes
@@ -17,7 +17,7 @@ else
V4L2_LIB = libv4l2.so
V4L2_OBJS += ../libv4lconvert/libv4lconvert.so
TARGETS += $(V4L2CONVERT)
-CPPFLAGS += -fPIC
+override CPPFLAGS += -fPIC
endif
ifeq ($(LIB_RELEASE),)
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
index c2a5be942..b7aa58b11 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
+++ b/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
@@ -1,4 +1,4 @@
-CPPFLAGS = -I../include -I../../../../linux/include
+override CPPFLAGS += -I../include -I../../../../linux/include
CFLAGS := -g -O1
CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes
@@ -7,7 +7,7 @@ ifeq ($(LINKTYPE),static)
CONVERT_LIB = libv4lconvert.a
else
CONVERT_LIB = libv4lconvert.so
-CPPFLAGS += -fPIC
+override CPPFLAGS += -fPIC
endif
CONVERT_OBJS = libv4lconvert.o tinyjpeg.o sn9c10x.o pac207.o \