From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 4 Oct 2013 18:04:21 +0000 (+0200)
Subject: OMK Makefile.rules updated to actual mainline version.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/rtems-devel.git/commitdiff_plain/30070e50dee5494dcc331b2880e71fec06de698d

OMK Makefile.rules updated to actual mainline version.

The update enables OMK build on FreeBSD systems when used
as development host.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---

diff --git a/rtems-omk-template/Makefile.rules b/rtems-omk-template/Makefile.rules
index 5638119..58d6288 100644
--- a/rtems-omk-template/Makefile.rules
+++ b/rtems-omk-template/Makefile.rules
@@ -4,7 +4,7 @@
 #  (C) Copyright 2006, 2007, 2008, 2009, 2010, 2011 by Michal Sojka - Czech Technical University, FEE, DCE
 #
 #  Homepage: http://rtime.felk.cvut.cz/omk/
-#  Version:  0.2-97-g532aeb1
+#  Version:  0.2-114-g1b1fb1a
 #
 # The OMK build system is distributed under the GNU General Public
 # License.  See file COPYING for details.
@@ -324,7 +324,7 @@ omkize:
 	fi
 	$(Q)for i in `find -L . -name Makefile.omk` ; do \
 	   d=`dirname $${i}`; \
-	   if ! test -f "$${d}/Makefile.rules" && ( test -f "$${d}/Makefile" && ! cmp --silent Makefile "$${d}/Makefile" ); then \
+	   if ! test -f "$${d}/Makefile.rules" && ( test -f "$${d}/Makefile" && ! cmp -s Makefile "$${d}/Makefile" ); then \
 	      rm -f "$${d}/Makefile"; \
 	      cp -v Makefile "$${d}/Makefile"; \
 	   fi \
@@ -336,14 +336,15 @@ endif
 
 ifneq ($(LN_HEADERS),y)
 define cp_cmd
-if ! cmp --quiet $(1) $(2); then \
+if ! cmp -s $(1) $(2); then \
     echo "  CP      $(1:$(OUTPUT_DIR)/%=%) -> $(2:$(OUTPUT_DIR)/%=%)"; \
-    install -D $(CPHEADER_FLAGS) $(1) $(2) || exit 1; \
+    install -d $(CPHEADER_FLAGS) `dirname $(2)` && \
+    install $(CPHEADER_FLAGS) $(1) $(2) || exit 1; \
 fi
 endef
 else
 define cp_cmd
-if ! cmp --quiet $(1) $(2); then \
+if ! cmp -s $(1) $(2); then \
     echo "  LN      $(1:$(OUTPUT_DIR)/%=%) -> $(2:$(OUTPUT_DIR)/%=%)"; \
     if [ -f $(1) ]; then d=$(2); mkdir -p $${d%/*} && ln -sf $(LNHEADER_FLAGS) $(1) $(2) || exit 1; else exit 1; fi; \
 fi
@@ -469,7 +470,7 @@ c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+	$(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
@@ -778,7 +779,7 @@ $(addprefix $(1)/,$(notdir $(addsuffix .stamp,$(2)))) : $(CONFIG_FILES)
 		  >> "$(2).tmp"
 	@echo "#endif /*$(4)*/" >> "$(2).tmp"
 	@touch "$$@"
-	@if cmp --quiet "$(2).tmp" "$(2)" ; then rm "$(2).tmp"; \
+	@if cmp -s "$(2).tmp" "$(2)" ; then rm "$(2).tmp"; \
 	else mv "$(2).tmp" "$(2)" ; \
 	echo "Updated configuration $(2)" ; fi