Selaa lähdekoodia

- more darwin build with libs fixes (works now)
- sercmd is no longer force-rebuilt every time

Andrei Pelinescu-Onciul 18 vuotta sitten
vanhempi
commit
08067fd56f
4 muutettua tiedostoa jossa 29 lisäystä ja 20 poistoa
  1. 2 2
      Makefile
  2. 8 8
      Makefile.libs
  3. 9 8
      Makefile.rules
  4. 10 2
      utils/sercmd/Makefile

+ 2 - 2
Makefile

@@ -501,8 +501,8 @@ install-modules-all: install-modules install-modules-doc
 install-doc: $(doc_prefix)/$(doc_dir) install-modules-doc
 	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/INSTALL 
 	$(INSTALL_DOC) INSTALL $(doc_prefix)/$(doc_dir)
-	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/README_MODULES 
-	$(INSTALL_DOC) README_MODULES $(doc_prefix)/$(doc_dir)
+	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/README-MODULES 
+	$(INSTALL_DOC) README-MODULES $(doc_prefix)/$(doc_dir)
 	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/AUTHORS 
 	$(INSTALL_DOC) AUTHORS $(doc_prefix)/$(doc_dir)
 	$(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/NEWS

+ 8 - 8
Makefile.libs

@@ -31,12 +31,6 @@ ifeq ($(BUGFIX_VER),)
 	BUGFIX_VER:=0
 endif
 
-ifeq	($(strip $(compile_for_install)),yes)
-	LIB_INSTALL_NAME:=$(lib_target)/$(LIB_RUNTIME_NAME)
-else
-	LIB_INSTALL_NAME:=$(shell pwd)/$(LIB_RUNTIME_NAME)
-endif
-
 ifeq ($(OS), darwin)
 	LIB_NAME:= \
 	$(LIB_PREFIX)$(NAME).$(MAJOR_VER).$(MINOR_VER).$(BUGFIX_VER)$(LIB_SUFFIX)
@@ -48,7 +42,7 @@ ifeq ($(OS), darwin)
 	# path to a linked library is taken from the library itself (the path
 	# is built-in the library)
 	LIBINAME_F:=libiname.lst
-	NAME_LD_FLAGS:= -compatibility_version $(MAJOR_VER).$(MINOR_VER) \
+	NAME_LD_FLAGS= -compatibility_version $(MAJOR_VER).$(MINOR_VER) \
 					-current_version $(MAJOR_VER).$(MINOR_VER).$(BUGFIX_VER) \
 					-install_name $(LIB_INSTALL_NAME)
 
@@ -56,10 +50,16 @@ else
 	LIB_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX).$(MAJOR_VER).$(MINOR_VER)
 	LIB_RUNTIME_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX).$(MAJOR_VER)
 	LIB_LINK_NAME:=$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX)
-	NAME_LD_FLAGS:= $(LIB_SONAME)$(LIB_RUNTIME_NAME)
+	NAME_LD_FLAGS= $(LIB_SONAME)$(LIB_RUNTIME_NAME)
 	LIBINAME_F:=
 endif
 
+ifeq	($(strip $(compile_for_install)),yes)
+	LIB_INSTALL_NAME:=$(lib_target)/$(LIB_RUNTIME_NAME)
+else
+	LIB_INSTALL_NAME:=$(shell pwd)/$(LIB_RUNTIME_NAME)
+endif
+
 
 COREPATH ?=../..
 

+ 9 - 8
Makefile.rules

@@ -35,8 +35,8 @@
 # on some ser libs)
 
 ifneq	($(SER_LIBS),)
-# realpath doesn't seem to work on darwin
-SER_LIBS_DIRS:=$(abspath $(dir $(SER_LIBS)))
+# abspath & realpath don't seem to work on darwin
+SER_LIBS_DIRS:=$(dir $(SER_LIBS))
 ifneq	(,$(filter install install% %install, $(MAKECMDGOALS)))
 lib_compile_for_install=yes
 expected_lib_ipath=$(lib_target)
@@ -78,7 +78,7 @@ ALL_LIBS+=$(foreach l, $(SER_LIBS), -L$(dir $l) -l$(notdir $l))
 $(NAME): $(SER_LIBS_DEPS) librpath.lst
 
 $(SER_LIBS_DEPS):
-	$(MAKE) -C $(dir $@)  compile_for_install=$(lib_compile_for_install)
+	$(MAKE) -wC $(dir $@)  compile_for_install=$(lib_compile_for_install)
 
 
 ifneq ($(SER_IPATH_LST),)
@@ -86,12 +86,13 @@ ifneq ($(SER_IPATH_LST),)
 $(NAME): $(SER_IPATH_LST) 
 
 $(SER_IPATH_LST): FORCE
-	@if grep "COMPILED_INAME:=$(call expected_lib_ipath,$(@D))" $(@) \
-			1>/dev/null 2>/dev/null ; \
+	@if grep \
+		"COMPILED_INAME:=$(call expected_lib_ipath,$(shell cd $(@D); pwd))" \
+		$(@) 1>/dev/null 2>/dev/null ; \
 	then :; \
 	else \
 		echo "re-building $(@D)" ; \
-		$(MAKE) -C $(@D) compile_for_install=$(lib_compile_for_install) ; \
+		$(MAKE) -wC $(@D) compile_for_install=$(lib_compile_for_install) ; \
 	fi
 
 .PHONY: FORCE
@@ -101,7 +102,7 @@ FORCE:
 FORCE-BUILD-LIBS:
 	@for r in $(SER_LIBS_DIRS) ; do \
 		echo building lib $$r; \
-		$(MAKE) -C $$r compile_for_install=$(lib_compile_for_install) ; \
+		$(MAKE) -wC $$r compile_for_install=$(lib_compile_for_install) ; \
 	done
 
 endif
@@ -132,7 +133,7 @@ clean:
 		if [ -d "$$r" ]; then \
 			echo "module $$r" ; \
 			$(MAKE) -C $$r clean ; \
-		        $(MAKE) -C $$r/doc clean ; \
+			$(MAKE) -C $$r/doc clean ; \
 		fi ; \
 	done 
 	@if [ -n "$(modules)" ]; then \

+ 10 - 2
utils/sercmd/Makefile

@@ -31,11 +31,19 @@ ifeq ($(use_readline),1)
 endif
 
 
-
 include ../../Makefile.sources
 include ../../Makefile.rules
 
-$(NAME).o: msg
+ifeq ($(use_readline),1)
+$(info readline detected ($(readline_path)) )
+$(info command completion enabled)
+else
+$(info "no readline include files detected, disabling readline support")
+$(info "command completion disabled" )
+$(info "(to force readline support try 'make use_readline=1')")
+endif
+
+$(NAME).o: 
 
 .PHONY: msg
 msg: