Currently, after a successful (or even partially successful) build, a subsequent 'make' at the top level will do nothing even if source files have changed. This does not seem to be useful behaviour. Therefore, this patch changes the top-level Makefile to run make in each subdirectory unconditionally.
Ben.
diff --git a/Makefile.tail b/Makefile.tail
index 6a8f549..6838011 100644
--- a/Makefile.tail
+++ b/Makefile.tail
@@ -1,40 +1,20 @@
##### End of variables to change
LIVEMEDIA_DIR = liveMedia
-LIVEMEDIA_LIB = $(LIVEMEDIA_DIR)/libliveMedia.$(LIB_SUFFIX)
GROUPSOCK_DIR = groupsock
-GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
USAGE_ENVIRONMENT_DIR = UsageEnvironment
-USAGE_ENVIRONMENT_LIB =
$(USAGE_ENVIRONMENT_DIR)/libUsageEnvironment.$(LIB_SUFFIX)
BASIC_USAGE_ENVIRONMENT_DIR = BasicUsageEnvironment
-BASIC_USAGE_ENVIRONMENT_LIB =
$(BASIC_USAGE_ENVIRONMENT_DIR)/libBasicUsageEnvironment.$(LIB_SUFFIX)
TESTPROGS_DIR = testProgs
-TESTPROGS_APP = $(TESTPROGS_DIR)/testMP3Streamer$(EXE)
MEDIA_SERVER_DIR = mediaServer
-MEDIA_SERVER_APP = $(MEDIA_SERVER_DIR)/mediaServer$(EXE)
-ALL = $(LIVEMEDIA_LIB) \
- $(GROUPSOCK_LIB) \
- $(USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP) \
- $(MEDIA_SERVER_APP)
-all: $(ALL)
-
-
-$(LIVEMEDIA_LIB):
+all:
cd $(LIVEMEDIA_DIR) ; $(MAKE)
-$(GROUPSOCK_LIB):
cd $(GROUPSOCK_DIR) ; $(MAKE)
-$(USAGE_ENVIRONMENT_LIB):
cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
-$(BASIC_USAGE_ENVIRONMENT_LIB):
cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
-$(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB)
$(BASIC_USAGE_ENVIRONMENT_LIB)
cd $(TESTPROGS_DIR) ; $(MAKE)
-$(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB)
$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
cd $(MEDIA_SERVER_DIR) ; $(MAKE)
clean:
--
1.6.4.3
signature.asc
Description: This is a digitally signed message part
_______________________________________________ live-devel mailing list live-devel@lists.live555.com http://lists.live555.com/mailman/listinfo/live-devel
