[SCM] liblivemedia/master: Remove file added to git by mistake
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Mon Oct 11 22:47:45 UTC 2010
The following commit has been merged in the master branch:
commit cf51f45e78f71bad2df99b4485a4581c6ab26ac0
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Fri Oct 1 22:40:30 2010 +0100
Remove file added to git by mistake
Git-Dch: Ignore
diff --git a/config.armlinux.orig b/config.armlinux.orig
deleted file mode 100644
index 3e604f7..0000000
--- a/config.armlinux.orig
+++ /dev/null
@@ -1,18 +0,0 @@
-CROSS_COMPILE= arm-elf-
-COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
-C = c
-C_COMPILER = $(CROSS_COMPILE)gcc
-C_FLAGS = $(COMPILE_OPTS)
-CPP = cpp
-CPLUSPLUS_COMPILER = $(CROSS_COMPILE)gcc
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
-OBJ = o
-LINK = $(CROSS_COMPILE)gcc -o
-LINK_OPTS = -L.
-CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILE)ar cr
-LIBRARY_LINK_OPTS = $(LINK_OPTS)
-LIB_SUFFIX = a
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/config.armlinux.rej b/config.armlinux.rej
deleted file mode 100644
index 49e7c9b..0000000
--- a/config.armlinux.rej
+++ /dev/null
@@ -1,35 +0,0 @@
-***************
-*** 1,16 ****
-- CROSS_COMPILE= arm-elf-
- COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
- C = c
- C_COMPILER = $(CROSS_COMPILE)gcc
- C_FLAGS = $(COMPILE_OPTS)
- CPP = cpp
-- CPLUSPLUS_COMPILER = $(CROSS_COMPILE)gcc
- CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
- OBJ = o
-- LINK = $(CROSS_COMPILE)gcc -o
-- LINK_OPTS = -L.
- CONSOLE_LINK_OPTS = $(LINK_OPTS)
-- LIBRARY_LINK = $(CROSS_COMPILE)ar cr
- LIBRARY_LINK_OPTS = $(LINK_OPTS)
- LIB_SUFFIX = a
- LIBS_FOR_CONSOLE_APPLICATION =
---- 1,16 ----
-+ CROSS_COMPILE?= arm-elf-
- COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
- C = c
- C_COMPILER = $(CROSS_COMPILE)gcc
- C_FLAGS = $(COMPILE_OPTS)
- CPP = cpp
-+ CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++
- CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
- OBJ = o
-+ LINK = $(CROSS_COMPILE)g++ -o
-+ LINK_OPTS =
- CONSOLE_LINK_OPTS = $(LINK_OPTS)
-+ LIBRARY_LINK = $(CROSS_COMPILE)ar cr
- LIBRARY_LINK_OPTS = $(LINK_OPTS)
- LIB_SUFFIX = a
- LIBS_FOR_CONSOLE_APPLICATION =
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list