Group :: System/Libraries
RPM: CQRlib
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: CQRlib-1.1.2-alt-debian-makefile.patch
Download
Download
diff -Naur CQRlib-1.1.2-orig/Makefile CQRlib-1.1.2/Makefile
--- CQRlib-1.1.2-orig/Makefile 2010-12-22 00:11:09.000000000 +0200
+++ CQRlib-1.1.2/Makefile 2011-09-23 19:36:38.407614351 +0300
@@ -76,7 +76,7 @@
EXAMPLES = $(ROOT)
TESTDATA = $(ROOT)
#INSTALLDIR = /usr/local
-INSTALLDIR = $(HOME)
+INSTALLDIR = $(DESTDIR)/usr
#
# Include directories
@@ -87,16 +87,21 @@
INCLUDES = -I$(INC)
endif
-COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
-BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
-BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
-CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c
-CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
-CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES)
-CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
-CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+#
+# C Libraries
+#
+CLIBRARIES = -lm
+
+COMPILE_COMMAND = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --tag=CC --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
+BUILD_COMMAND_LOCAL = $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+BUILD_COMMAND_STATIC = $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+CPPCOMPILE_COMMAND = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c
+CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
+CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES)
+CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(CPPFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
@@ -255,7 +260,8 @@
#
$(LIB)/libCQRlib.$(LIB_EXT): $(SOURCE) $(HEADERS) $(COMMONDEP)
$(COMPILE_COMMAND) -c $(SOURCE)
- $(LIBRARY_LINK_COMMAND) -o $(LIB)/libCQRlib.$(LIB_EXT) *.$(OBJ_EXT)
+ $(LIBRARY_LINK_COMMAND) -o $(LIB)/libCQRlib.$(LIB_EXT) *.$(OBJ_EXT) \
+ $(CLIBRARIES)
#
# CQRlibTest example program
@@ -296,7 +302,9 @@
@-rm -f $(TESTDATA)/CPPQRTest.lst
@-rm -f $(TESTDATA)/CPPQRTest_static.lst
@-rm -f $(TESTDATA)/CPPQRTest_dynamic.lst
-
+ @-rm -rf .libs
+ @-rm -f CPPQRTest.cpp.*
+
#
# Remove temporary files
#