comparison Makefile @ 326:bd54819ccfa7 prerelease

Makefile: run does not re-link. Faster check for libpd

   PROJECT?=exampleTempProject
   PROJECT_DIR?=$(abspath projects/$(PROJECT))
   $(shell rm -rf $(PROJECT_DIR))
   $(shell cp -r examples/$(EXAMPLE) $(PROJECT_DIR))
 endif
+OUTPUT_FILE=$(PROJECT_DIR)/$(PROJECT)
+COMMAND_LINE_OPTIONS=$(CL)
+RUN_COMMAND=$(OUTPUT_FILE) $(COMMAND_LINE_OPTIONS)
 
 SCREEN_NAME?=BeagleRT
 
 #TODO: run these lines only if the command is not syntax or 
 $(shell mkdir -p $(PROJECT_DIR)/build)
 RM := rm -rf
 STATIC_LIBS := ./libprussdrv.a ./libNE10.a
 LIBS := -lrt -lnative -lxenomai -lsndfile
 
 # refresh library cache and check if libpd is there
-TEST_LIBPD := $(shell ldconfig; ldconfig -p | grep "libpd\.so") 
-ifeq ($(strip $(TEST_LIBPD)), )
-else
+#TEST_LIBPD := $(shell ldconfig; ldconfig -p | grep "libpd\.so")  # safest but slower way of checking
+LIBPD_PATH = /usr/lib/libpd.so
+TEST_LIBPD := $(shell which $(LIBPD_PATH))
+ifneq ($(strip $(TEST_LIBPD)), )
 # if libpd is there, link it in
   LIBS += -lpd -lpthread_rt
 endif
 
 CPP_FLAGS := -O3 -march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon -ftree-vectorize 

 # This is a nasty kludge: we want to be able to optionally link in a default
 # main file if the user hasn't supplied one. We check for the presence of the main()
 # function, and conditionally call one of two recursive make targets depending on whether
 # we want to link in the default main file or not. The kludge is the mess of a shell script
 # line below. Surely there's a better way to do this?
-Bela: $(CORE_ASM_OBJS) $(CORE_OBJS) $(ASM_OBJS) $(C_OBJS) $(CPP_OBJS) $(STATIC_LIBS) $(DEFAULT_MAIN_OBJS)
+$(OUTPUT_FILE): $(CORE_ASM_OBJS) $(CORE_OBJS) $(ASM_OBJS) $(C_OBJS) $(CPP_OBJS) $(STATIC_LIBS) $(DEFAULT_MAIN_OBJS)
 	$(eval DEFAULT_MAIN_CONDITIONAL := $(shell bash -c 'if [ `nm $(PROJECT_DIR)/build/*.o | grep -w T | grep -w main | wc -l` == '0' ]; then echo "$(DEFAULT_MAIN_OBJS)"; else echo ""; fi'))
 	@echo 'Invoking: C++ linker'
 	@$(CXX) $(SYNTAX_FLAG) -L/usr/xenomai/lib -L/usr/arm-linux-gnueabihf/lib -L/usr/arm-linux-gnueabihf/lib/xenomai -L/usr/lib/arm-linux-gnueabihf -pthread -Wpointer-arith -o "$(PROJECT_DIR)/$(PROJECT)" $(CORE_ASM_OBJS) $(CORE_OBJS) $(DEFAULT_MAIN_CONDITIONAL) $(ASM_OBJS) $(C_OBJS) $(CPP_OBJS) $(STATIC_LIBS) $(LIBS)
 	@echo 'Finished building target: $@'
 

 # This rule compiles c and c++ source files without output or linking
 SYNTAX: $(C_OBJS) $(CPP_OBJS)
 
 # Remove the project's build objects & binary
 projectclean:
-	-$(RM) $(PROJECT_DIR)/build/* $(PROJECT_DIR)/$(PROJECT)
+	-$(RM) $(PROJECT_DIR)/build/* $(OUTPUT_FILE)
 	-@echo ' '	
 
 # Remove all the built objects, including the core Bela objects
 distclean:
-	-$(RM) build/source/* $(CORE_OBJS) $(CORE_CPP_DEPS) $(DEFAULT_MAIN_OBJS) $(DEFAULT_MAIN_CPP_DEPS) Bela
+	-$(RM) build/source/* $(CORE_OBJS) $(CORE_CPP_DEPS) $(DEFAULT_MAIN_OBJS) $(DEFAULT_MAIN_CPP_DEPS) $(OUTPUT_FILE)
 	-@echo ' '
-OUTPUT_FILE="$(PROJECT_DIR)/$(PROJECT)"
-
-$(OUTPUT_FILE): Bela
-COMMAND_LINE_OPTIONS=$(CL)
-RUN_COMMAND=$(OUTPUT_FILE) $(COMMAND_LINE_OPTIONS)
+
+Bela: $(OUTPUT_FILE)
+
 runfg: run
-run: stop $(OUTPUT_FILE)
+run: stop Bela
 	echo "Running $(RUN_COMMAND)"
 	$(RUN_COMMAND)
 runscreen: stop $(OUTPUT_FILE)
 	echo "Running $(RUN_COMMAND) in a screen"
 	screen -S $(SCREEN_NAME) -d -m $(RUN_COMMAND)

 #	-@echo ' '
 
 post-build:
 # Nothing to do here (for now)
 
-.PHONY: all clean distclean projectclean dependents debug run
+.PHONY: all clean distclean projectclean dependents debug run runfg runscreen stop 
 .SECONDARY: post-build