diff options
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | bin/genomes/32shftr.anc (renamed from tsalis/bin/genomes/32shftr.anc) | 0 | ||||
| -rw-r--r-- | bin/genomes/55.anc (renamed from tsalis/bin/genomes/55.anc) | 0 | ||||
| -rw-r--r-- | lib/.keep | 0 | ||||
| -rw-r--r-- | tsalis/Makefile | 4 |
5 files changed, 6 insertions, 11 deletions
@@ -1,14 +1,11 @@ -AR := ar
CC := gcc
-SLIB := lib/libsalis.a
-DLIB := lib/libsalis.so
+LIB := bin/libsalis.so
SOURCES := $(wildcard src/*.c)
OBJECTS := $(patsubst src/%.c,build/%.o,$(SOURCES))
DEPS := $(patsubst %.o,%.d,$(OBJECTS))
-SLFLAGS := rs
-DLFLAGS := -shared
+LFLAGS := -shared
# uncomment for debug
# OFLAGS := -ggdb
@@ -20,8 +17,7 @@ CFLAGS := -Iinclude -c $(OFLAGS) -MMD -Wall -Wextra -std=c89 -pedantic-errors \ -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition
all: $(OBJECTS)
- $(AR) $(SLFLAGS) $(SLIB) $(OBJECTS)
- $(CC) $(DLFLAGS) -o $(DLIB) $(OBJECTS)
+ $(CC) $(LFLAGS) -o $(LIB) $(OBJECTS)
$(MAKE) -C tsalis
-include $(DEPS)
@@ -31,6 +27,5 @@ $(OBJECTS): $(patsubst build/%.o,src/%.c,$@) clean:
-rm build/*
- -rm $(SLIB)
- -rm $(DLIB)
+ -rm $(LIB)
$(MAKE) clean -C tsalis
diff --git a/tsalis/bin/genomes/32shftr.anc b/bin/genomes/32shftr.anc index 756bd9c..756bd9c 100644 --- a/tsalis/bin/genomes/32shftr.anc +++ b/bin/genomes/32shftr.anc diff --git a/tsalis/bin/genomes/55.anc b/bin/genomes/55.anc index ca02b65..ca02b65 100644 --- a/tsalis/bin/genomes/55.anc +++ b/bin/genomes/55.anc diff --git a/lib/.keep b/lib/.keep deleted file mode 100644 index e69de29..0000000 --- a/lib/.keep +++ /dev/null diff --git a/tsalis/Makefile b/tsalis/Makefile index c393350..5312c12 100644 --- a/tsalis/Makefile +++ b/tsalis/Makefile @@ -1,11 +1,11 @@ CC := gcc -BIN := bin/tsalis +BIN := ../bin/tsalis SOURCES := $(wildcard src/*.c) OBJECTS := $(patsubst src/%.c,build/%.o,$(SOURCES)) DEPS := $(patsubst %.o,%.d,$(OBJECTS)) -LFLAGS := -L ../lib -lsalis -lncurses +LFLAGS := -L ../bin -l:libsalis.so -lncurses # uncomment for debug # OFLAGS := -ggdb |