rpms
/
libkni3
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
libkni3/kni-3.9.2-verbose.patch

261 lines
7.7 KiB
Diff
Raw Permalink Blame History

diff -Naur KNI_3.9.2.orig/demo/burnintest/Makefile KNI_3.9.2/demo/burnintest/Makefile
--- KNI_3.9.2.orig/demo/burnintest/Makefile 2007-06-20 08:05:24.000000000 +0200
+++ KNI_3.9.2/demo/burnintest/Makefile 2013-08-26 06:56:25.276226404 +0200
@@ -29,29 +29,15 @@
AVAILABLE_LIBRARIES = ../common/keyboard.o ${BASE_LIBRARY} ${INVKIN_LIBRARY} ${LM_LIBRARY}
-.SILENT:
-
.SUFFIXES: .cpp.o
.cpp.o:
- echo -n "Compiling: $@"
- if $(CXX) $(CXXFLAGS) $(INCLUDE) -c $< 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) $(INCLUDE) -c $<
all: BurnInTest
BurnInTest: BurnInTest.o
- echo -n "Building: $@"
- if $(CXX) $(CXXFLAGS) -lpthread -o $@ $@.o ${AVAILABLE_LIBRARIES} 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -lpthread -o $@ $@.o ${AVAILABLE_LIBRARIES}
clean:
echo "Cleaning up"
diff -Naur KNI_3.9.2.orig/demo/Makefile KNI_3.9.2/demo/Makefile
--- KNI_3.9.2.orig/demo/Makefile 2013-08-25 10:10:07.359358007 +0200
+++ KNI_3.9.2/demo/Makefile 2013-08-26 07:38:44.218398437 +0200
@@ -40,27 +40,13 @@
AVAILABLE_LIBRARIES = ./common/keyboard.o
-.SILENT:
-
all: $(TARGETS_D)
$(CTARGETS_D):
- echo -n "Building: $@"
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c -o common/$(@:.common=).o $(wildcard common/$(@:.common=).cpp) 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c -o common/$(@:.common=).o $(wildcard common/$(@:.common=).cpp)
$(TARGETS_D): $(CTARGETS_D)
- echo -n "Building: $@"
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -L../lib/linux -o $(@:.demo=)/$(@:.demo=) $(wildcard $(@:.demo=)/*.cpp) ${AVAILABLE_LIBRARIES} -lKNIBase3 -lKNI_InvKin3 -lKNI_LM3 -lpthread
$(TARGETS_D_C):
echo "Cleaning: $(@:_clean=)"
diff -Naur KNI_3.9.2.orig/Makefile KNI_3.9.2/Makefile
--- KNI_3.9.2.orig/Makefile 2007-09-27 07:47:18.000000000 +0200
+++ KNI_3.9.2/Makefile 2013-08-26 05:50:13.692299525 +0200
@@ -22,8 +22,6 @@
TARGETS_B = $(foreach target,$(TARGETS),$(target).build)
TARGETS_C = $(foreach target,$(TARGETS),$(target).clean)
-.SILENT:
-
.PHONY: all doc
all:
diff -Naur KNI_3.9.2.orig/src/Base/Makefile KNI_3.9.2/src/Base/Makefile
--- KNI_3.9.2.orig/src/Base/Makefile 2013-08-25 10:10:07.359358007 +0200
+++ KNI_3.9.2/src/Base/Makefile 2013-08-26 06:53:10.626994097 +0200
@@ -40,44 +40,19 @@
SLCFLAGS=-fPIC
SLLDFLAGS = -shared -L$(TARGET_DIR)
-.SILENT:
-
.SUFFIXES: .cpp.o
.cpp.o:
- echo -n "Compiling: $@"
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
all: $(TARGETS)
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
- echo -n "Adding common/additional dependencies..."
- if $(AR) -r $@ $(ADDITIONAL_DEPS) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
+ $(AR) -r $@ $(ADDITIONAL_DEPS)
$(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
- then echo " [ok]"; \
- ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
- cat .slog; \
- else echo " [failed]"; \
- cat .slog; \
- fi
+ $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS)
alib: $(TARGET_DIR)/$(LIBNAME_A)
diff -Naur KNI_3.9.2.orig/src/common/Makefile KNI_3.9.2/src/common/Makefile
--- KNI_3.9.2.orig/src/common/Makefile 2013-08-25 10:10:07.360358023 +0200
+++ KNI_3.9.2/src/common/Makefile 2013-08-25 10:11:41.347932392 +0200
@@ -37,23 +37,12 @@
.SUFFIXES: .cpp.o
.cpp.o:
- echo -n "Compiling: $@"
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
all: $(TARGETS)
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
alib: $(TARGET_DIR)/$(LIBNAME_A)
diff -Naur KNI_3.9.2.orig/src/InvKin/Makefile KNI_3.9.2/src/InvKin/Makefile
--- KNI_3.9.2.orig/src/InvKin/Makefile 2013-08-25 10:10:07.360358023 +0200
+++ KNI_3.9.2/src/InvKin/Makefile 2013-08-26 06:54:35.950411253 +0200
@@ -41,44 +41,19 @@
SLLDFLAGS=-shared -L$(TARGET_DIR) -lKNIBase3
-.SILENT:
-
.SUFFIXES: .cpp.o
.cpp.o:
- echo -n "Compiling: $@"
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
all: $(TARGETS)
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
- echo -n "Adding common/additional dependencies..."
- if $(AR) -r $@ $(ADDITIONAL_DEPS) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
+ $(AR) -r $@ $(ADDITIONAL_DEPS)
$(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
- then echo " [ok]"; \
- ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
- cat .slog; \
- else echo " [failed]"; \
- cat .slog; \
- fi
+ $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS)
alib: $(TARGET_DIR)/$(LIBNAME_A)
diff -Naur KNI_3.9.2.orig/src/LM/Makefile KNI_3.9.2/src/LM/Makefile
--- KNI_3.9.2.orig/src/LM/Makefile 2013-08-25 10:10:07.360358023 +0200
+++ KNI_3.9.2/src/LM/Makefile 2013-08-26 06:55:51.692668775 +0200
@@ -45,39 +45,16 @@
.SUFFIXES: .cpp.o
.cpp.o:
- echo -n "Compiling: $@"
- if $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $< 2>.clog; \
- then echo " [ok]"; \
- cat .clog; \
- else echo " [failed]"; \
- cat .clog; \
- fi
+ $(CXX) $(CXXFLAGS) -I$(INCLUDE_DIR) -c $<
all: $(TARGETS)
$(TARGET_DIR)/$(LIBNAME_A): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
- echo -n "Adding common/additional dependencies..."
- if $(AR) -r $@ $(ADDITIONAL_DEPS) 1>.alog 2>.alog; \
- then echo " [ok]"; \
- else echo " [failed]"; \
- cat .alog; \
- fi
+ $(AR) $(ARFLAGS) $@ $(SOURCES:.cpp=.o)
+ $(AR) -r $@ $(ADDITIONAL_DEPS)
$(TARGET_DIR)/$(LIBNAME_SO): $(SOURCES:.cpp=.o)
- echo -n "Building: $@"
- if $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS) 2>.slog; \
- then echo " [ok]"; \
- ln -s $(LIBNAME_SO) $(TARGET_DIR)/$(LIBNAME_SO_LN); \
- cat .slog; \
- else echo " [failed]"; \
- cat .slog; \
- fi
+ $(CXX) $(CXXFLAGS) $(SLLDFLAGS) -o $@ -Wl,-soname,$(LIBNAME_SONAME) $(SOURCES:.cpp=.o) $(ADDITIONAL_DEPS)
alib: $(TARGET_DIR)/$(LIBNAME_A)
Reference in New Issue View Git Blame Copy Permalink