live-link.patch

   1 --- live/BasicUsageEnvironment/Makefile.tail.orig       2011-03-15 00:40:37.000000000 +0100
   2 +++ live/BasicUsageEnvironment/Makefile.tail    2011-03-16 18:09:05.547417970 +0100
   3 @@ -8,9 +8,11 @@
   4         BasicTaskScheduler0.$(OBJ) BasicTaskScheduler.$(OBJ) \
   5         DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
   6
   7 +LIBRARY_DEPS = ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
   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) $<
  16 --- live/groupsock/Makefile.tail.orig   2011-03-15 00:40:37.000000000 +0100
  17 +++ live/groupsock/Makefile.tail        2011-03-16 18:11:05.827411266 +0100
  18 @@ -25,10 +25,12 @@
  19  NetAddress.$(CPP):     include/NetAddress.hh include/GroupsockHelper.hh
  20  IOHandlers.$(CPP):     include/IOHandlers.hh include/TunnelEncaps.hh
  21
  22 +LIBRARY_DEPS = ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
  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/*~
  32 --- live/liveMedia/Makefile.tail.orig   2011-03-15 00:40:37.000000000 +0100
  33 +++ live/liveMedia/Makefile.tail        2011-03-16 18:34:20.507409590 +0100
  34 @@ -45,10 +45,12 @@
  35
  36  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)
  37
  38 +LIBRARY_DEPS = ../groupsock/libgroupsock.$(LIB_SUFFIX) ../BasicUsageEnvironment/libBasicUsageEnvironment.$(LIB_SUFFIX) ../UsageEnvironment/libUsageEnvironment.$(LIB_SUFFIX)
  39 +
  40  $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
  41      $(PLATFORM_SPECIFIC_LIB_OBJS)
  42         $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
  43 -               $(LIVEMEDIA_LIB_OBJS)
  44 +               $(LIVEMEDIA_LIB_OBJS) $(LIBRARY_LINK_DEPS)
  45
  46  Media.$(CPP):          include/Media.hh
  47  include/Media.hh:      include/liveMedia_version.hh
  48 --- live/Makefile.tail.orig     2011-03-16 19:18:57.767415456 +0100
  49 +++ live/Makefile.tail  2011-03-16 19:30:31.367419646 +0100
  50 @@ -10,10 +10,10 @@
  51  MEDIA_SERVER_DIR = mediaServer
  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)
  62