projects / packages / live.git / blame
| Commit | Line | Data |
|---|---|---|
| 4e0e02bd JB |
1 | --- live/live/BasicUsageEnvironment/Makefile.tail.orig 2011-03-15 00:40:37.000000000 +0100 |
| 2 | +++ live/live/BasicUsageEnvironment/Makefile.tail 2011-03-16 18:09:05.547417970 +0100 | |
| fe23064d JB |
3 | @@ -8,9 +8,11 @@ |
| 4 | BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \ | |
| 5 | DelayQueue.$(OBJ) BasicHashTable.$(OBJ) | |
| 6 | ||
| 32fd5524 | 7 | +LIBRARY_DEPS = ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX) |
| fe23064d JB |
8 | + |
| 9 | libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS) | |
| 10 | $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ | |
| 11 | - $(OBJS) | |
| 12 | + $(OBJS) $(LIBRARY_LINK_DEPS) | |
| 13 | ||
| 14 | .$(C).$(OBJ): | |
| 15 | $(C_COMPILER) -c $(C_FLAGS) $< | |
| 4e0e02bd JB |
16 | --- live-2021.04.06/live/groupsock/Makefile.tail.orig 2021-04-29 22:24:40.845013105 +0200 |
| 17 | +++ live-2021.04.06/live/groupsock/Makefile.tail 2021-04-29 22:29:12.265873479 +0200 | |
| 18 | @@ -24,10 +24,12 @@ NetInterface.$(CPP): include/NetInterfac | |
| fe23064d | 19 | NetAddress.$(CPP): include/NetAddress.hh include/GroupsockHelper.hh |
| 4e0e02bd | 20 | IOHandlers.$(CPP): include/IOHandlers.hh |
| fe23064d | 21 | |
| 32fd5524 | 22 | +LIBRARY_DEPS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX) |
| fe23064d JB |
23 | + |
| 24 | libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \ | |
| 25 | $(PLATFORM_SPECIFIC_LIB_OBJS) | |
| 26 | $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ | |
| 27 | - $(GROUPSOCK_LIB_OBJS) | |
| 28 | + $(GROUPSOCK_LIB_OBJS) $(LIBRARY_LINK_DEPS) | |
| 29 | ||
| 30 | clean: | |
| 31 | -rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~ | |
| 4e0e02bd JB |
32 | --- live/live/liveMedia/Makefile.tail.orig 2020-05-19 19:11:05.573270651 +0200 |
| 33 | +++ live/live/liveMedia/Makefile.tail 2020-05-19 19:58:52.524405711 +0200 | |
| 9f534116 | 34 | @@ -65,10 +65,12 @@ |
| fe23064d | 35 | |
| 9f534116 | 36 | LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC_SOURCE_OBJS) $(MISC_SINK_OBJS) $(MISC_FILTER_OBJS) $(RTP_OBJS) $(RTCP_OBJS) $(GENERIC_MEDIA_SERVER_OBJS) $(RTSP_OBJS) $(SIP_OBJS) $(SESSION_OBJS) $(QUICKTIME_OBJS) $(AVI_OBJS) $(TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(MATROSKA_OBJS) $(OGG_OBJS) $(TRANSPORT_STREAM_DEMUX_OBJS) $(HLS_OBJS) $(SECURITY_OBJS) $(MISC_OBJS) |
| fe23064d | 37 | |
| 9f534116 | 38 | +LIBRARY_DEPS = ../groupsock/libgroupsock.$(libgroupsock_LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(libBasicUsageEnvironment_LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(libUsageEnvironment_LIB_SUFFIX) |
| fe23064d JB |
39 | + |
| 40 | $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \ | |
| 41 | $(PLATFORM_SPECIFIC_LIB_OBJS) | |
| 42 | $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ | |
| 9f534116 JB |
43 | - $(LIVEMEDIA_LIB_OBJS) $(LIBS_FOR_LIVEMEDIA_LIB) |
| 44 | + $(LIVEMEDIA_LIB_OBJS) $(LIBRARY_LINK_DEPS) $(LIBS_FOR_LIVEMEDIA_LIB) | |
| fe23064d JB |
45 | |
| 46 | Media.$(CPP): include/Media.hh | |
| 47 | include/Media.hh: include/liveMedia_version.hh | |
| 4e0e02bd JB |
48 | --- live-2021.04.06/live/Makefile.tail.orig 2021-04-29 22:24:40.848346613 +0200 |
| 49 | +++ live-2021.04.06/live/Makefile.tail 2021-04-29 22:30:26.453086366 +0200 | |
| 50 | @@ -14,10 +14,10 @@ PROXY_SERVER_DIR = proxyServer | |
| 51 | HLS_PROXY_DIR = hlsProxy | |
| fe23064d JB |
52 | |
| 53 | all: | |
| 54 | - cd $(LIVEMEDIA_DIR) ; $(MAKE) | |
| 55 | - cd $(GROUPSOCK_DIR) ; $(MAKE) | |
| 56 | cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) | |
| 57 | cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) | |
| 58 | + cd $(GROUPSOCK_DIR) ; $(MAKE) | |
| 59 | + cd $(LIVEMEDIA_DIR) ; $(MAKE) | |
| 60 | cd $(TESTPROGS_DIR) ; $(MAKE) | |
| 61 | cd $(MEDIA_SERVER_DIR) ; $(MAKE) | |
| 4e0e02bd JB |
62 | cd $(PROXY_SERVER_DIR) ; $(MAKE) |
| 63 | --- live-2021.04.06/live/config.linux-with-shared-libraries.orig 2021-04-29 22:24:40.848346613 +0200 | |
| 64 | +++ live-2021.04.06/live/config.linux-with-shared-libraries 2021-04-29 22:31:14.575602890 +0200 | |
| 65 | @@ -39,6 +39,7 @@ LIBRARY_LINK = $(CC) -o | |
| 32fd5524 JB |
66 | SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE)) |
| 67 | LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION) | |
| 68 | LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS) | |
| 69 | +LIBRARY_LINK_DEPS = $(LIBRARY_DEPS) | |
| fa75e603 | 70 | LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto |
| 32fd5524 | 71 | LIBS_FOR_GUI_APPLICATION = |
| 4e0e02bd | 72 | LIBS_FOR_LIVEMEDIA_LIB = -lssl -lcrypto |