Attachment #273009 for bug #309681

Lines 7-16 Link Here

(-)a/live/BasicUsageEnvironment/Makefile.tail (-1 / +2 lines)
7	OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \	7	OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \
8	BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \	8	BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \
9	DelayQueue.$(OBJ) BasicHashTable.$(OBJ)	9	DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
		10	LIBS = ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
10		11
11	libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)	12	libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
12	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \	13	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
13	$(OBJS)	14	$(OBJS) $(LIBS)
14		15
15	.$(C).$(OBJ):	16	.$(C).$(OBJ):
16	$(C_COMPILER) -c $(C_FLAGS) $<	17	$(C_COMPILER) -c $(C_FLAGS) $<




	$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<

GROUPSOCK_LIB_OBJS = GroupsockHelper.$(OBJ) GroupEId.$(OBJ) inet.$(OBJ) Groupsock.$(OBJ) NetInterface.$(OBJ) NetAddress.$(OBJ) IOHandlers.$(OBJ)
GROUPSOCK_LIBS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX)

GroupsockHelper.$(CPP):	include/GroupsockHelper.hh
include/GroupsockHelper.hh:	include/NetAddress.hh

IOHandlers.$(CPP):	include/IOHandlers.hh include/TunnelEncaps.hh

libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
    $(PLATFORM_SPECIFIC_LIB_OBJS) $(GROUPSOCK_LIBS)
	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
		$(GROUPSOCK_LIB_OBJS) $(GROUPSOCK_LIBS)

clean:
	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~




MISC_OBJS = DarwinInjector.$(OBJ) BitVector.$(OBJ) StreamParser.$(OBJ) DigestAuthentication.$(OBJ) our_md5.$(OBJ) our_md5hl.$(OBJ) Base64.$(OBJ) Locale.$(OBJ)

LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(RTSP_OBJS) $(SIP_OBJS) $(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS) $(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MISC_OBJS)
LIVEMEDIA_LIBS =  ../groupsock/libgroupsock.$(LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX)

$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS) \
    $(PLATFORM_SPECIFIC_LIB_OBJS)
	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
		$(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS)

Media.$(CPP):		include/Media.hh
include/Media.hh:	include/liveMedia_version.hh

Return to bug 309681

Lines 42-52 Link Here

(-)a/live/liveMedia/Makefile.tail (-2 / +3 lines)
42	MISC_OBJS = DarwinInjector.$(OBJ) BitVector.$(OBJ) StreamParser.$(OBJ) DigestAuthentication.$(OBJ) our_md5.$(OBJ) our_md5hl.$(OBJ) Base64.$(OBJ) Locale.$(OBJ)	42	MISC_OBJS = DarwinInjector.$(OBJ) BitVector.$(OBJ) StreamParser.$(OBJ) DigestAuthentication.$(OBJ) our_md5.$(OBJ) our_md5hl.$(OBJ) Base64.$(OBJ) Locale.$(OBJ)
43		43
44	LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(RTSP_OBJS) $(SIP_OBJS) $(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS) $(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MISC_OBJS)	44	LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(RTSP_OBJS) $(SIP_OBJS) $(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS) $(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MISC_OBJS)
		45	LIVEMEDIA_LIBS = ../groupsock/libgroupsock.$(LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX)
45		46
46	$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \	47	$(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS) \
47	$(PLATFORM_SPECIFIC_LIB_OBJS)	48	$(PLATFORM_SPECIFIC_LIB_OBJS)
48	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \	49	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
49	$(LIVEMEDIA_LIB_OBJS)	50	$(LIVEMEDIA_LIB_OBJS) $(LIVEMEDIA_LIBS)
50		51
51	Media.$(CPP): include/Media.hh	52	Media.$(CPP): include/Media.hh
52	include/Media.hh: include/liveMedia_version.hh	53	include/Media.hh: include/liveMedia_version.hh

Lines 10-15 Link Here

(-)a/live/groupsock/Makefile.tail (-2 / +3 lines)
10	$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<	10	$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
11		11
12	GROUPSOCK_LIB_OBJS = GroupsockHelper.$(OBJ) GroupEId.$(OBJ) inet.$(OBJ) Groupsock.$(OBJ) NetInterface.$(OBJ) NetAddress.$(OBJ) IOHandlers.$(OBJ)	12	GROUPSOCK_LIB_OBJS = GroupsockHelper.$(OBJ) GroupEId.$(OBJ) inet.$(OBJ) Groupsock.$(OBJ) NetInterface.$(OBJ) NetAddress.$(OBJ) IOHandlers.$(OBJ)
		13	GROUPSOCK_LIBS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX)
13		14
14	GroupsockHelper.$(CPP): include/GroupsockHelper.hh	15	GroupsockHelper.$(CPP): include/GroupsockHelper.hh
15	include/GroupsockHelper.hh: include/NetAddress.hh	16	include/GroupsockHelper.hh: include/NetAddress.hh
Lines 26-34 Link Here
26	IOHandlers.$(CPP): include/IOHandlers.hh include/TunnelEncaps.hh	27	IOHandlers.$(CPP): include/IOHandlers.hh include/TunnelEncaps.hh
27		28
28	libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \	29	libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
29	$(PLATFORM_SPECIFIC_LIB_OBJS)	30	$(PLATFORM_SPECIFIC_LIB_OBJS) $(GROUPSOCK_LIBS)
30	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \	31	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
31	$(GROUPSOCK_LIB_OBJS)	32	$(GROUPSOCK_LIB_OBJS) $(GROUPSOCK_LIBS)
32		33
33	clean:	34	clean:
34	-rm -rf .$(OBJ) $(ALL) core .core ~ include/~	35	-rm -rf .$(OBJ) $(ALL) core .core ~ include/~