|
Takanori MATSUURA |
e3e84f4 |
--- CQRlib-1.0.6/Makefile.lib64 2010-08-25 20:38:56.991145821 +0900
|
|
Takanori MATSUURA |
e3e84f4 |
+++ CQRlib-1.0.6/Makefile 2010-08-25 20:48:42.347039793 +0900
|
|
Takanori MATSUURA |
e3e84f4 |
@@ -69,7 +69,7 @@
|
|
Takanori MATSUURA |
e3e84f4 |
# Directories
|
|
Takanori MATSUURA |
e3e84f4 |
#
|
|
Takanori MATSUURA |
e3e84f4 |
ROOT = .
|
|
Takanori MATSUURA |
e3e84f4 |
-LIB = $(ROOT)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
+LIB = $(ROOT)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
BIN = $(ROOT)/bin
|
|
Takanori MATSUURA |
e3e84f4 |
SRC = $(ROOT)
|
|
Takanori MATSUURA |
e3e84f4 |
INC = $(ROOT)
|
|
Takanori MATSUURA |
e3e84f4 |
@@ -88,15 +88,15 @@
|
|
Takanori MATSUURA |
e3e84f4 |
endif
|
|
Takanori MATSUURA |
e3e84f4 |
|
|
Takanori MATSUURA |
e3e84f4 |
COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
|
|
Takanori MATSUURA |
e3e84f4 |
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
|
|
Takanori MATSUURA |
e3e84f4 |
-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
-BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c
|
|
Takanori MATSUURA |
e3e84f4 |
-CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
+CPPLIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES)
|
|
Takanori MATSUURA |
e3e84f4 |
-CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
-CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
+CPPBUILD_COMMAND_DYNAMIC= $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -rdynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
+CPPBUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
|
|
Takanori MATSUURA |
e3e84f4 |
INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
|
|
Takanori MATSUURA |
e3e84f4 |
|
|
Takanori MATSUURA |
e3e84f4 |
@@ -196,10 +196,10 @@
|
|
Takanori MATSUURA |
e3e84f4 |
$(LIB)/libCQRlib.$(LIB_EXT) \
|
|
Takanori MATSUURA |
e3e84f4 |
$(BIN)/CQRlibTest $(BIN)/CPPQRTest
|
|
Takanori MATSUURA |
e3e84f4 |
|
|
Takanori MATSUURA |
e3e84f4 |
-install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
|
|
Takanori MATSUURA |
e3e84f4 |
+install: all $(INSTALLDIR) $(INSTALLDIR)/lib64 $(INSTALLDIR)/include \
|
|
Takanori MATSUURA |
e3e84f4 |
$(INC) $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
|
|
Takanori MATSUURA |
e3e84f4 |
- $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
|
|
Takanori MATSUURA |
e3e84f4 |
- $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
|
|
Takanori MATSUURA |
e3e84f4 |
+ $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib64/libCQRlib.$(LIB_EXT)
|
|
Takanori MATSUURA |
e3e84f4 |
+ $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib64/libCQRlib.$(LIB_EXT)
|
|
Takanori MATSUURA |
e3e84f4 |
-cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h
|
|
Takanori MATSUURA |
e3e84f4 |
cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h
|
|
Takanori MATSUURA |
e3e84f4 |
chmod 644 $(INSTALLDIR)/include/cqrlib.h
|
|
Takanori MATSUURA |
e3e84f4 |
@@ -234,8 +234,8 @@
|
|
Takanori MATSUURA |
e3e84f4 |
$(INSTALLDIR):
|
|
Takanori MATSUURA |
e3e84f4 |
mkdir -p $(INSTALLDIR)
|
|
Takanori MATSUURA |
e3e84f4 |
|
|
Takanori MATSUURA |
e3e84f4 |
-$(INSTALLDIR)/lib: $(INSTALLDIR)
|
|
Takanori MATSUURA |
e3e84f4 |
- mkdir -p $(INSTALLDIR)/lib
|
|
Takanori MATSUURA |
e3e84f4 |
+$(INSTALLDIR)/lib64: $(INSTALLDIR)
|
|
Takanori MATSUURA |
e3e84f4 |
+ mkdir -p $(INSTALLDIR)/lib64
|
|
Takanori MATSUURA |
e3e84f4 |
|
|
Takanori MATSUURA |
e3e84f4 |
$(INSTALLDIR)/bin: $(INSTALLDIR)
|
|
Takanori MATSUURA |
e3e84f4 |
mkdir -p $(INSTALLDIR)/bin
|