aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2012-06-22 18:01:03 +0200
committerJakob Odersky <jodersky@gmail.com>2012-06-22 18:01:03 +0200
commit424bbf13d6e53be6d4463dab6613c571e96ddf75 (patch)
tree22a2dd087ad1988aa2feb4455de24cba9c526d68
parent1cdbf77729bc41c1e9b900d2da93ed428f693eb0 (diff)
downloadk8055-424bbf13d6e53be6d4463dab6613c571e96ddf75.tar.gz
k8055-424bbf13d6e53be6d4463dab6613c571e96ddf75.tar.bz2
k8055-424bbf13d6e53be6d4463dab6613c571e96ddf75.zip
Revert "reformat .so files to include version number"
This reverts commit 1cdbf77729bc41c1e9b900d2da93ed428f693eb0.
-rw-r--r--.gitignore2
-rw-r--r--Makefile8
-rw-r--r--src/Makefile5
3 files changed, 8 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index a15e635..198a929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ target/
.project
.cproject
src/*.o
-src/*.so.*
+src/*.so
src/k8055-*
*~
diff --git a/Makefile b/Makefile
index 9a4d0e0..1d3f74f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ compile:
make -C src
copy: compile mkdirs
- cp src/*.so.* target/lib
+ cp src/*.so target/lib
cp src/*.h target/include
clean:
@@ -41,9 +41,9 @@ uninstall-permissions: uninstall-rules
install: compile
mkdir -p $(PREFIX)/lib
mkdir -p $(PREFIX)/include
- cp src/*.so.* $(PREFIX)/lib
+ cp src/*.so $(PREFIX)/lib
cp src/*.h $(PREFIX)/include
uninstall:
- rm -f $(PREFIX)/lib/libk8055.so.1.0
- rm -f $(PREFIX)/include/k8055.h
+ rm $(PREFIX)/lib/libk8055.so
+ rm $(PREFIX)/include/k8055.h
diff --git a/src/Makefile b/src/Makefile
index a01363d..cb3818d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,8 @@ CFLAGS = -std=c99 -O2 -Wall
all: libk8055.so
libk8055.so: k8055.o
- $(C) -shared -Wl,-soname,libk8055.so.1 -o libk8055.so.1.0 k8055.o -lusb-1.0 -lm
+ $(C) -shared -o libk8055.so k8055.o -lusb-1.0 -lm
+
libk8055.a: k8055.o
$(C) -o libk8055.a k8055.o -lusb-1.0 -lm
@@ -15,7 +16,7 @@ k8055.o: k8055.c
clean:
rm -rf *.o
- rm -rf *.so.*
+ rm -rf *.so
rm -rf k8055-*
test: k8055.c test.c