osl-0.2.0.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ebb0debe99bacd4087a765a62322f415ac85b24..6f5b391370e784330264a4a1febad3f77fa40dff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@
 # increases performance and avoids hard-to-debug behaviour.
 .SUFFIXES:
 MAKEFLAGS += -Rr
-ifeq ("$(origin CC)", "default")
+CC := $(CC)
+ifeq ($(strip $(CC)),)
        CC := cc
 endif
 
@@ -14,17 +15,14 @@ includedir := $(PREFIX)/include
 bindir := $(PREFIX)/bin
 mandir := $(PREFIX)/man/man1
 
-objects := osl.o util.o rbtree.o sha1.o
-fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o oslfsck.lsg.o
+objects := osl.o util.o rbtree.o sha1.o sha3.o sha256.o
+fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o sha3.o sha256.o oslfsck.lsg.o
 deps := $(sort $(objects:.o=.d) $(fsck_objects:.o=.d))
 headers := osl.h
 executables := oslfsck
 man_pages := oslfsck.1
 
 INSTALL := install
-ifeq "$(origin CC)" "default"
-        CC := cc
-endif
 MKDIR := mkdir -p
 RM := rm -f
 LN := ln
@@ -34,8 +32,8 @@ OBJCOPY := objcopy
 
 # libosl's versioning consists of three numbers. Let's call them x, y and z.
 x := 0
-y := 1
-z := 3
+y := 2
+z := 0
 VERSION := $(x).$(y).$(z)
 
 OSL_CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'