Am Sonntag, den 06.01.2013, 03:11 +1300 schrieb Ross Finlayson: > I'll make the first suggested change (adding LDFLAGS), but not the > second. The "$(LIBRARY_LINK)$@" has to remain as is, because - for > some configurations (e.g., "sunos") - there can't be a space there. > Also, I'm not going to "fix what's not broken".
Thanks. I have attached a smaller, less intrusive patch for the trailing space removal. These removals have no bad side effect. -- Benjamin Drung Debian & Ubuntu Developer
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..8d3b374 100644 --- a/BasicUsageEnvironment/Makefile.tail +++ b/BasicUsageEnvironment/Makefile.tail @@ -14,7 +14,7 @@ libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS) $(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..7722519 100644 --- a/UsageEnvironment/Makefile.tail +++ b/UsageEnvironment/Makefile.tail @@ -11,7 +11,7 @@ $(USAGE_ENVIRONMENT_LIB): $(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/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..5f87b13 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) $< 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..b5df228 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) $< 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..8b5cd38 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) $<
_______________________________________________ live-devel mailing list live-devel@lists.live555.com http://lists.live555.com/mailman/listinfo/live-devel
