From b11c47df5cf8d2832227bfac00cb48da522010f2 Mon Sep 17 00:00:00 2001
From: Paul Oliver <contact@pauloliver.dev>
Date: Thu, 29 Feb 2024 01:50:44 +0100
Subject: All executables now placed on ./bin/ directory.

---
 Makefile                       | 13 ++++---------
 bin/genomes/32shftr.anc        |  1 +
 bin/genomes/55.anc             |  1 +
 lib/.keep                      |  0
 tsalis/Makefile                |  4 ++--
 tsalis/bin/genomes/32shftr.anc |  1 -
 tsalis/bin/genomes/55.anc      |  1 -
 7 files changed, 8 insertions(+), 13 deletions(-)
 create mode 100644 bin/genomes/32shftr.anc
 create mode 100644 bin/genomes/55.anc
 delete mode 100644 lib/.keep
 delete mode 100644 tsalis/bin/genomes/32shftr.anc
 delete mode 100644 tsalis/bin/genomes/55.anc

diff --git a/Makefile b/Makefile
index 1e80311..230df19 100644
--- a/Makefile
+++ b/Makefile
@@ -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/bin/genomes/32shftr.anc b/bin/genomes/32shftr.anc
new file mode 100644
index 0000000..756bd9c
--- /dev/null
+++ b/bin/genomes/32shftr.anc
@@ -0,0 +1 @@
+A[a1u<<<<<}02B.13:23^1^2v?(b$(a
diff --git a/bin/genomes/55.anc b/bin/genomes/55.anc
new file mode 100644
index 0000000..ca02b65
--- /dev/null
+++ b/bin/genomes/55.anc
@@ -0,0 +1 @@
+A[a]a1^1-11B!3#1#3?3)c{12)dC}12D.03:23^^2v1?1(d$~3~1(bA
diff --git a/lib/.keep b/lib/.keep
deleted file mode 100644
index e69de29..0000000
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
diff --git a/tsalis/bin/genomes/32shftr.anc b/tsalis/bin/genomes/32shftr.anc
deleted file mode 100644
index 756bd9c..0000000
--- a/tsalis/bin/genomes/32shftr.anc
+++ /dev/null
@@ -1 +0,0 @@
-A[a1u<<<<<}02B.13:23^1^2v?(b$(a
diff --git a/tsalis/bin/genomes/55.anc b/tsalis/bin/genomes/55.anc
deleted file mode 100644
index ca02b65..0000000
--- a/tsalis/bin/genomes/55.anc
+++ /dev/null
@@ -1 +0,0 @@
-A[a]a1^1-11B!3#1#3?3)c{12)dC}12D.03:23^^2v1?1(d$~3~1(bA
-- 
cgit v1.2.1