Hi,
The build system should honor LDFLAGS for the shared library (like it
does for the static library). linker-flags.patch is attached.
There are some trailing spaces in the Makefiles. Some variables in
config.* have trailing spaces. The Makefiles should not rely on having a
space at the end of a variable. strip-trailing-spaces.patch is attached.
--
Benjamin Drung
Debian & Ubuntu Developer
Description: Pass LDFLAGS to the shared library linker
Author: Benjamin Drung <bdr...@debian.org>
--- a/config.linux-with-shared-libraries
+++ b/config.linux-with-shared-libraries
@@ -38,7 +38,7 @@
LIBRARY_LINK = gcc -o
SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
-LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX)
+LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
EXE =
diff --git a/BasicUsageEnvironment/Makefile.head b/BasicUsageEnvironment/Makefile.head
index 230d184..7d42ff5 100644
--- a/BasicUsageEnvironment/Makefile.head
+++ b/BasicUsageEnvironment/Makefile.head
@@ -1,4 +1,4 @@
INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include
PREFIX = /usr/local
LIBDIR = /usr/local/lib
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/BasicUsageEnvironment/Makefile.tail b/BasicUsageEnvironment/Makefile.tail
index 84de5df..8bffb44 100644
--- a/BasicUsageEnvironment/Makefile.tail
+++ b/BasicUsageEnvironment/Makefile.tail
@@ -10,11 +10,11 @@ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \
DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \
$(OBJS)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
diff --git a/UsageEnvironment/Makefile.head b/UsageEnvironment/Makefile.head
index 00a6d6c..85acf7d 100644
--- a/UsageEnvironment/Makefile.head
+++ b/UsageEnvironment/Makefile.head
@@ -1,4 +1,4 @@
INCLUDES = -Iinclude -I../groupsock/include
PREFIX = /usr/local
LIBDIR = /usr/local/lib
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/UsageEnvironment/Makefile.tail b/UsageEnvironment/Makefile.tail
index 96c6227..2fa4061 100644
--- a/UsageEnvironment/Makefile.tail
+++ b/UsageEnvironment/Makefile.tail
@@ -8,10 +8,10 @@ all: $(ALL)
OBJS = UsageEnvironment.$(OBJ) HashTable.$(OBJ) strDup.$(OBJ)
$(USAGE_ENVIRONMENT_LIB): $(OBJS)
- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) $(OBJS)
+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) $(OBJS)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
diff --git a/config.armeb-uclibc b/config.armeb-uclibc
index 922647a..6eabe0d 100644
--- a/config.armeb-uclibc
+++ b/config.armeb-uclibc
@@ -11,8 +11,8 @@ OBJ = o
LINK = $(CROSS_COMPILE)gcc -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILE)ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = $(CROSS_COMPILE)ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.armlinux b/config.armlinux
index f827c48..86b571d 100644
--- a/config.armlinux
+++ b/config.armlinux
@@ -1,18 +1,18 @@
-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 =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
+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 =
+LIBS_FOR_GUI_APPLICATION =
+EXE =
diff --git a/config.avr32-linux b/config.avr32-linux
index 14e3a51..473f725 100644
--- a/config.avr32-linux
+++ b/config.avr32-linux
@@ -1,14 +1,17 @@
CROSS_COMPILE= avr32-linux-uclibc-
-COMPILE_OPTS = -Os $(INCLUDES) -msoft-float -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 C = c
+COMPILE_OPTS = -Os $(INCLUDES) -msoft-float -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1
+C = c
C_COMPILER = $(CROSS_COMPILE)gcc
C_FLAGS = $(COMPILE_OPTS)
CPP = cpp
CPLUSPLUS_COMPILER = $(CROSS_COMPILE)c++
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -fuse-cxa-atexit -DBSD=1 OBJ = o
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -fuse-cxa-atexit -DBSD=1
+OBJ = o
LINK = $(CROSS_COMPILE)c++ -o
-LINK_OPTS =
+LINK_OPTS =
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILE)ar cr LIBRARY_LINK_OPTS =
+LIBRARY_LINK = $(CROSS_COMPILE)ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.bfin-linux-uclibc b/config.bfin-linux-uclibc
index 3342b7a..4400ac4 100644
--- a/config.bfin-linux-uclibc
+++ b/config.bfin-linux-uclibc
@@ -10,8 +10,8 @@ OBJ = o
LINK = $(CROSS_COMPILER)g++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILER)ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = $(CROSS_COMPILER)ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.bfin-uclinux b/config.bfin-uclinux
index 157572e..fddc2dc 100644
--- a/config.bfin-uclinux
+++ b/config.bfin-uclinux
@@ -10,8 +10,8 @@ OBJ = o
LINK = $(CROSS_COMPILER)g++ -Wl,-elf2flt -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILER)ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = $(CROSS_COMPILER)ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.cygwin b/config.cygwin
index 20e3382..b9a2c71 100644
--- a/config.cygwin
+++ b/config.cygwin
@@ -6,10 +6,10 @@ CPP = cpp
CPLUSPLUS_COMPILER = c++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
OBJ = o
-LINK = c++ -o
+LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
+LIBRARY_LINK = ld -o
LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
diff --git a/config.freebsd b/config.freebsd
index 1e8c150..05561b5 100644
--- a/config.freebsd
+++ b/config.freebsd
@@ -9,8 +9,8 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.iphone-simulator b/config.iphone-simulator
index 31fdc50..2c3683c 100644
--- a/config.iphone-simulator
+++ b/config.iphone-simulator
@@ -13,10 +13,10 @@ CPP = cpp
CPLUSPLUS_COMPILER = $(TOOL_PATH)/g++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
-LINK = $(TOOL_PATH)/g++ -o
+LINK = $(TOOL_PATH)/g++ -o
LINK_OPTS = -L. -arch i386 --sysroot=$(SDK) -L$(SDK)/usr/lib/system
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = libtool -s -o
+LIBRARY_LINK = libtool -s -o
LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
diff --git a/config.iphoneos b/config.iphoneos
index 37033a9..9d140fe 100644
--- a/config.iphoneos
+++ b/config.iphoneos
@@ -13,10 +13,10 @@ CPP = cpp
CPLUSPLUS_COMPILER = $(TOOL_PATH)/g++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
-LINK = $(TOOL_PATH)/g++ -o
+LINK = $(TOOL_PATH)/g++ -o
LINK_OPTS = -L. -arch armv7 --sysroot=$(SDK) -L$(SDK)/usr/lib/system
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = libtool -s -o
+LIBRARY_LINK = libtool -s -o
LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
diff --git a/config.linux b/config.linux
index d0ec446..67c450b 100644
--- a/config.linux
+++ b/config.linux
@@ -9,8 +9,8 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L. $(LDFLAGS)
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.linux-64bit b/config.linux-64bit
index 09df0a7..15da3f6 100644
--- a/config.linux-64bit
+++ b/config.linux-64bit
@@ -9,8 +9,8 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.linux-gdb b/config.linux-gdb
index 87387e5..1d796d8 100644
--- a/config.linux-gdb
+++ b/config.linux-gdb
@@ -9,8 +9,8 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
index c749a2c..f5d6000 100644
--- a/config.linux-with-shared-libraries
+++ b/config.linux-with-shared-libraries
@@ -35,7 +35,7 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L. $(LDFLAGS)
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = gcc -o
+LIBRARY_LINK = gcc -o
SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX)
diff --git a/config.macosx b/config.macosx
index 2e880e9..9710fb6 100644
--- a/config.macosx
+++ b/config.macosx
@@ -6,11 +6,11 @@ CPP = cpp
CPLUSPLUS_COMPILER = c++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
-LINK = c++ -o
+LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = libtool -s -o
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = libtool -s -o
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.macosx-32bit b/config.macosx-32bit
index 92f1c29..34bc52c 100644
--- a/config.macosx-32bit
+++ b/config.macosx-32bit
@@ -6,11 +6,11 @@ CPP = cpp
CPLUSPLUS_COMPILER = c++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
-LINK = c++ -o
+LINK = c++ -o
LINK_OPTS = -L. -m32
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = libtool -s -o
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = libtool -s -o
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.macosx-before-version-10.4 b/config.macosx-before-version-10.4
index b1e3420..915854f 100644
--- a/config.macosx-before-version-10.4
+++ b/config.macosx-before-version-10.4
@@ -6,11 +6,11 @@ CPP = cpp
CPLUSPLUS_COMPILER = c++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
-LINK = c++ -o
+LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r
+LIBRARY_LINK = ld -o
+LIBRARY_LINK_OPTS = $(LINK_OPTS) -r
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
diff --git a/config.mingw b/config.mingw
index e9bf55c..42a69be 100644
--- a/config.mingw
+++ b/config.mingw
@@ -6,10 +6,10 @@ CPP = cpp
CPLUSPLUS_COMPILER = $(CXX)
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
OBJ = o
-LINK = $(CXX) -o
+LINK = $(CXX) -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(LD) -o
+LIBRARY_LINK = $(LD) -o
LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION = -lws2_32
diff --git a/config.solaris-64bit b/config.solaris-64bit
index 60ec3b4..bb44cd0 100644
--- a/config.solaris-64bit
+++ b/config.solaris-64bit
@@ -6,7 +6,7 @@ CPP = cpp
CPLUSPLUS_COMPILER = c++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
OBJ = o
-LINK = c++ -m64 -o
+LINK = c++ -m64 -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
LIBRARY_LINK = ld -o
diff --git a/config.uClinux b/config.uClinux
index 1e0696b..9605265 100644
--- a/config.uClinux
+++ b/config.uClinux
@@ -12,8 +12,8 @@ OBJ = o
LINK = $(CROSS_COMPILE)g++ -o
LINK_OPTS = -L. $(LDFLAGS)
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CROSS_COMPILE)ar cr
-LIBRARY_LINK_OPTS =
+LIBRARY_LINK = $(CROSS_COMPILE)ar cr
+LIBRARY_LINK_OPTS =
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION = $(CXXLIBS)
LIBS_FOR_GUI_APPLICATION = $(LIBS_FOR_CONSOLE_APPLICATION)
diff --git a/groupsock/Makefile.head b/groupsock/Makefile.head
index bba2e17..1d24a89 100644
--- a/groupsock/Makefile.head
+++ b/groupsock/Makefile.head
@@ -1,4 +1,4 @@
INCLUDES = -Iinclude -I../UsageEnvironment/include
PREFIX = /usr/local
LIBDIR = /usr/local/lib
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/groupsock/Makefile.tail b/groupsock/Makefile.tail
index 765e50f..bec4f5f 100644
--- a/groupsock/Makefile.tail
+++ b/groupsock/Makefile.tail
@@ -5,7 +5,7 @@ ALL = $(NAME).$(LIB_SUFFIX)
all: $(ALL)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
@@ -28,7 +28,7 @@ IOHandlers.$(CPP): include/IOHandlers.hh include/TunnelEncaps.hh
libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
$(PLATFORM_SPECIFIC_LIB_OBJS)
- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \
$(GROUPSOCK_LIB_OBJS)
clean:
diff --git a/liveMedia/Makefile.head b/liveMedia/Makefile.head
index 230d184..7d42ff5 100644
--- a/liveMedia/Makefile.head
+++ b/liveMedia/Makefile.head
@@ -1,4 +1,4 @@
INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include
PREFIX = /usr/local
LIBDIR = /usr/local/lib
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/liveMedia/Makefile.tail b/liveMedia/Makefile.tail
index fe33f66..164ff1f 100644
--- a/liveMedia/Makefile.tail
+++ b/liveMedia/Makefile.tail
@@ -6,7 +6,7 @@ ALL = $(LIVEMEDIA_LIB)
all: $(ALL)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
@@ -56,7 +56,7 @@ LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_F
$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
$(PLATFORM_SPECIFIC_LIB_OBJS)
- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \
$(LIVEMEDIA_LIB_OBJS)
Media.$(CPP): include/Media.hh
diff --git a/mediaServer/Makefile.head b/mediaServer/Makefile.head
index 53b60f3..e81e1ba 100644
--- a/mediaServer/Makefile.head
+++ b/mediaServer/Makefile.head
@@ -4,4 +4,4 @@ libliveMedia_LIB_SUFFIX = $(LIB_SUFFIX)
libBasicUsageEnvironment_LIB_SUFFIX = $(LIB_SUFFIX)
libUsageEnvironment_LIB_SUFFIX = $(LIB_SUFFIX)
libgroupsock_LIB_SUFFIX = $(LIB_SUFFIX)
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/mediaServer/Makefile.tail b/mediaServer/Makefile.tail
index 4558f8e..729e855 100644
--- a/mediaServer/Makefile.tail
+++ b/mediaServer/Makefile.tail
@@ -7,7 +7,7 @@ ALL = $(MEDIA_SERVER)
all: $(ALL)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
diff --git a/proxyServer/Makefile.head b/proxyServer/Makefile.head
index 53b60f3..e81e1ba 100644
--- a/proxyServer/Makefile.head
+++ b/proxyServer/Makefile.head
@@ -4,4 +4,4 @@ libliveMedia_LIB_SUFFIX = $(LIB_SUFFIX)
libBasicUsageEnvironment_LIB_SUFFIX = $(LIB_SUFFIX)
libUsageEnvironment_LIB_SUFFIX = $(LIB_SUFFIX)
libgroupsock_LIB_SUFFIX = $(LIB_SUFFIX)
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/proxyServer/Makefile.tail b/proxyServer/Makefile.tail
index 4ed7c4b..76a6f56 100644
--- a/proxyServer/Makefile.tail
+++ b/proxyServer/Makefile.tail
@@ -7,7 +7,7 @@ ALL = $(PROXY_SERVER)
all: $(ALL)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
diff --git a/testProgs/Makefile.head b/testProgs/Makefile.head
index 53b60f3..e81e1ba 100644
--- a/testProgs/Makefile.head
+++ b/testProgs/Makefile.head
@@ -4,4 +4,4 @@ libliveMedia_LIB_SUFFIX = $(LIB_SUFFIX)
libBasicUsageEnvironment_LIB_SUFFIX = $(LIB_SUFFIX)
libUsageEnvironment_LIB_SUFFIX = $(LIB_SUFFIX)
libgroupsock_LIB_SUFFIX = $(LIB_SUFFIX)
-##### Change the following for your environment:
+##### Change the following for your environment:
diff --git a/testProgs/Makefile.tail b/testProgs/Makefile.tail
index 6c5da30..851c72e 100644
--- a/testProgs/Makefile.tail
+++ b/testProgs/Makefile.tail
@@ -18,7 +18,7 @@ all: $(ALL)
extra: testGSMStreamer$(EXE)
.$(C).$(OBJ):
- $(C_COMPILER) -c $(C_FLAGS) $<
+ $(C_COMPILER) -c $(C_FLAGS) $<
.$(CPP).$(OBJ):
$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
@@ -70,62 +70,62 @@ LOCAL_LIBS = $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
LIBS = $(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
testMP3Streamer$(EXE): $(MP3_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MP3_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MP3_STREAMER_OBJS) $(LIBS)
testMP3Receiver$(EXE): $(MP3_RECEIVER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MP3_RECEIVER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MP3_RECEIVER_OBJS) $(LIBS)
testRelay$(EXE): $(RELAY_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(RELAY_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(RELAY_OBJS) $(LIBS)
testReplicator$(EXE): $(REPLICATOR_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(REPLICATOR_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(REPLICATOR_OBJS) $(LIBS)
testMPEG1or2Splitter$(EXE): $(MPEG_1OR2_SPLITTER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_SPLITTER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_SPLITTER_OBJS) $(LIBS)
testMPEG1or2VideoStreamer$(EXE): $(MPEG_1OR2_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_STREAMER_OBJS) $(LIBS)
testMPEG1or2VideoReceiver$(EXE): $(MPEG_1OR2_VIDEO_RECEIVER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_RECEIVER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_RECEIVER_OBJS) $(LIBS)
testMPEG1or2AudioVideoStreamer$(EXE): $(MPEG_1OR2_AUDIO_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_AUDIO_VIDEO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_AUDIO_VIDEO_STREAMER_OBJS) $(LIBS)
testMPEG2TransportStreamer$(EXE): $(MPEG2_TRANSPORT_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAMER_OBJS) $(LIBS)
testMPEG2TransportReceiver$(EXE): $(MPEG2_TRANSPORT_RECEIVER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_RECEIVER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_RECEIVER_OBJS) $(LIBS)
testMPEG4VideoStreamer$(EXE): $(MPEG4_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG4_VIDEO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG4_VIDEO_STREAMER_OBJS) $(LIBS)
testH264VideoStreamer$(EXE): $(H264_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_STREAMER_OBJS) $(LIBS)
testDVVideoStreamer$(EXE): $(DV_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(DV_VIDEO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(DV_VIDEO_STREAMER_OBJS) $(LIBS)
testWAVAudioStreamer$(EXE): $(WAV_AUDIO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(WAV_AUDIO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(WAV_AUDIO_STREAMER_OBJS) $(LIBS)
testAMRAudioStreamer$(EXE): $(AMR_AUDIO_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(AMR_AUDIO_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(AMR_AUDIO_STREAMER_OBJS) $(LIBS)
testOnDemandRTSPServer$(EXE): $(ON_DEMAND_RTSP_SERVER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(ON_DEMAND_RTSP_SERVER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(ON_DEMAND_RTSP_SERVER_OBJS) $(LIBS)
vobStreamer$(EXE): $(VOB_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(VOB_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(VOB_STREAMER_OBJS) $(LIBS)
testRTSPClient$(EXE): $(TEST_RTSP_CLIENT_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(TEST_RTSP_CLIENT_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(TEST_RTSP_CLIENT_OBJS) $(LIBS)
openRTSP$(EXE): $(OPEN_RTSP_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(OPEN_RTSP_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(OPEN_RTSP_OBJS) $(LIBS)
playSIP$(EXE): $(PLAY_SIP_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(PLAY_SIP_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(PLAY_SIP_OBJS) $(LIBS)
sapWatch$(EXE): $(SAP_WATCH_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(SAP_WATCH_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(SAP_WATCH_OBJS) $(LIBS)
testMPEG1or2AudioVideoToDarwin$(EXE): $(MPEG_1OR2_AUDIO_VIDEO_TO_DARWIN_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_AUDIO_VIDEO_TO_DARWIN_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_AUDIO_VIDEO_TO_DARWIN_OBJS) $(LIBS)
testMPEG4VideoToDarwin$(EXE): $(MPEG_4_VIDEO_TO_DARWIN_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_4_VIDEO_TO_DARWIN_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_4_VIDEO_TO_DARWIN_OBJS) $(LIBS)
testMPEG1or2ProgramToTransportStream$(EXE): $(MPEG_1OR2_PROGRAM_TO_TRANSPORT_STREAM_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_PROGRAM_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_PROGRAM_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
testH264VideoToTransportStream$(EXE): $(H264_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
MPEG2TransportStreamIndexer$(EXE): $(MPEG2_TRANSPORT_STREAM_INDEXER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_INDEXER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_INDEXER_OBJS) $(LIBS)
testMPEG2TransportStreamTrickPlay$(EXE): $(MPEG2_TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(LIBS)
testGSMStreamer$(EXE): $(GSM_STREAMER_OBJS) $(LOCAL_LIBS)
- $(LINK)$@ $(CONSOLE_LINK_OPTS) $(GSM_STREAMER_OBJS) $(LIBS)
+ $(LINK) $@ $(CONSOLE_LINK_OPTS) $(GSM_STREAMER_OBJS) $(LIBS)
clean:
-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
_______________________________________________
live-devel mailing list
live-devel@lists.live555.com
http://lists.live555.com/mailman/listinfo/live-devel
