-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update spaln to 3.0.5 * Update spaln to 3.0.6 * edit patches * skip osx for now --------- Co-authored-by: Joshua Zhuang <[email protected]> Co-authored-by: mencian <[email protected]>
- Loading branch information
1 parent
e542a72
commit b7f3f0e
Showing
3 changed files
with
18 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
diff --git a/src/Makefile.in b/src/Makefile.in | ||
index ed5cb96..2d837d0 100644 | ||
index 7e0ab8d..bd09001 100644 | ||
--- a/src/Makefile.in | ||
+++ b/src/Makefile.in | ||
@@ -1,19 +1,19 @@ | ||
@@ -1,20 +1,20 @@ | ||
# Makefile.in for splan/sortgrcd | ||
# Copyright(c) Osamu Gotoh <<[email protected]>> | ||
|
||
|
@@ -14,9 +14,10 @@ index ed5cb96..2d837d0 100644 | |
+table_dir = $(PREFIX)/share/spaln/table | ||
+alndbs_dir = $(PREFIX)/share/spaln/alndbs | ||
+CXX = $(CXX) | ||
#CXX = clang++ | ||
# for MACOS uncomment below line | ||
#CXX = clang++ -std=c++11 | ||
-CFLAGS = -O3 -march=native | ||
+CFLAGS += -O3 | ||
+CFLAGS = -O3 | ||
RANLIB = ranlib | ||
-LD = g++ | ||
+LD = $(CXX) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,22 @@ | ||
diff --git a/src/Makefile.in b/src/Makefile.in | ||
index 7e0ab8d..f6c7256 100644 | ||
--- a/src/Makefile.in | ||
+++ b/src/Makefile.in | ||
@@ -23,8 +23,9 @@ PROG_F = fitild compild decompild plotild | ||
PROG = $(PROG_B) $(PROG_A) $(PROG_F) | ||
|
||
STDH = stdtype.h | ||
-CLIB = clib.a -lpthread -lm -lz | ||
+CLIB = clib.a | ||
SLIB = sblib.a $(CLIB) | ||
+LLIB = -lpthread -lm -lz | ||
ULIB = ublib.a $(SLIB) | ||
|
||
BINDIR = $(DESTDIR)$(exec_prefix) | ||
@@ -88,13 +89,13 @@ ls: | ||
@@ -95,13 +95,13 @@ ls: | ||
ls $(SRC) $(HDR) | ||
|
||
spaln: spaln.cc blksrc.o $(SLIB) | ||
- $(CXX) -o $@ spaln.cc blksrc.o $(SLIB) $(ILIB) | ||
- $(CXX) -o $@ spaln.cc blksrc.o $(SLIB) $(LLIB) | ||
+ $(CXX) $(LDFLAGS) -o $@ spaln.cc blksrc.o $(SLIB) $(LLIB) | ||
sortgrcd: sortgrcd.cc $(SLIB) | ||
- $(CXX) -o $@ sortgrcd.cc $(SLIB) $(ILIB) | ||
- $(CXX) -o $@ sortgrcd.cc $(SLIB) $(LLIB) | ||
+ $(CXX) $(LDFLAGS) -o $@ sortgrcd.cc $(SLIB) $(LLIB) | ||
makdbs: makdbs.cc dbs.h seq.h bitpat.h $(SLIB) | ||
- $(CXX) -o $@ makdbs.cc $(SLIB) $(ILIB) | ||
- $(CXX) -o $@ makdbs.cc $(SLIB) $(LLIB) | ||
+ $(CXX) $(LDFLAGS) -o $@ makdbs.cc $(SLIB) $(LLIB) | ||
makmdm: makmdm.cc mdm.h $(CLIB) | ||
- $(CXX) -o $@ makmdm.cc $(CLIB) $(ILIB) | ||
- $(CXX) -o $@ makmdm.cc $(CLIB) $(LLIB) | ||
+ $(CXX) $(LDFLAGS) -o $@ makmdm.cc $(CLIB) $(LLIB) | ||
|
||
dvn: dvn.cc autocomp.h $(ULIB) | ||
$(CXX) -o $@ dvn.cc $(ULIB) $(ILIB) | ||
$(CXX) -o $@ dvn.cc $(ULIB) $(LLIB) |