Add relative() to utils

[libs/core.git] / Makefile

diff --git a/Makefile b/Makefile
index a4e723f1686acd755996b604540893e4ade5a968..c316117cb61878639a9cbbea01f26c0a1bd98dc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+LIBRARY                = path
+LIBFILE                = libmsppath
+
 TMP            = $(HOME)/nightwatch/tmp
 TGT            = $(HOME)/nightwatch
 
@@ -5,14 +8,18 @@ CXX           = g++
 CC             = gcc
 AR             = ar
 CP             = cp
+
 INCLUDE                = -Isource -I$(TMP)/include
 LIB            = -L$(TMP)
 DEBUG          = 
-CFLAGS         = $(DEBUG) $(INCLUDE) -pipe -Wall `pkg-config --cflags sigc++-2.0` `sdl-config --cflags`
+CFLAGS         = $(DEBUG) $(INCLUDE) -pipe -Wall
 CXXFLAGS       = $(CFLAGS)
+MAKEFLAGS      += -s --no-print-directory
+
+PIC            = -fPIC
+SHARED         = .so
+STATIC         = .a
 
-LIBRARY                = path
-LIBFILE                = libmsppath
 SRC            = source
 LIBOBJS                = $(addprefix $(TMP)/, $(addsuffix .o, $(notdir $(basename $(wildcard $(SRC)/*.cpp)))))
 
@@ -20,19 +27,19 @@ pkgincludedir       = include/msp/$(LIBRARY)
 libdir         = lib
 
 .PHONY: all
-all: $(TMP) $(TMP)/$(LIBFILE).so $(TMP)/$(LIBFILE).a tmpheaders
+all: $(TMP) $(TMP)/$(LIBFILE)$(SHARED) $(TMP)/$(LIBFILE)$(STATIC) tmpheaders
 
 # Create temp directory
 $(TMP):
        mkdir -p $@
 
 # Dynamic library
-$(TMP)/$(LIBFILE).so: $(LIBOBJS)
+$(TMP)/$(LIBFILE)$(SHARED): $(LIBOBJS)
        echo "Compiling $(notdir $@)"
-       $(CXX) $^ -shared -o $@ $(LIB) $(LIBRARYLIBS)
+       $(CXX) $^ -shared -o $@ $(LIB)
 
 # Static library
-$(TMP)/$(LIBFILE).a: $(LIBOBJS)
+$(TMP)/$(LIBFILE)$(STATIC): $(LIBOBJS)
        echo "Compiling $(notdir $@)"
        $(AR) rcs $@ $^
 
@@ -47,11 +54,11 @@ $(TMP)/$(pkgincludedir):
 # Library object file
 $(TMP)/%.o: $(SRC)/%.cpp $(wildcard $(SRC)/*.h)
        echo "Compiling $(LIBRARY)/$(notdir $(basename $@))"
-       $(CXX) -fPIC $(CXXFLAGS) -c $< -o $@
+       $(CXX) $(PIC) $(CXXFLAGS) -c $< -o $@
 
 # Installs
 .PHONY: install
-install: install_headers install_lib install_staticlib
+install: install_lib
 
 $(TGT)/$(pkgincludedir):
        mkdir -p $@
@@ -65,11 +72,11 @@ install_headers: $(TGT)/$(pkgincludedir)
        $(CP) $(SRC)/*.h $<
 
 .PHONY: install_lib
-install_lib: $(TGT)/$(libdir) $(TMP)/$(LIBFILE).so
+install_lib: $(TGT)/$(libdir) $(TMP)/$(LIBFILE)$(SHARED)
        echo "Installing dynamic library to $<"
-       $(CP) $(TMP)/$(LIBFILE).so $<
+       $(CP) $(TMP)/$(LIBFILE)$(SHARED) $<
 
 .PHONY: install_staticlib
-install_staticlib: $(TGT)/$(libdir) $(TMP)/$(LIBFILE).a
+install_staticlib: $(TGT)/$(libdir) $(TMP)/$(LIBFILE)$(STATIC)
        echo "Installing static library to $<"
-       $(CP) $(TMP)/$(LIBFILE).a $<
+       $(CP) $(TMP)/$(LIBFILE)$(STATIC) $<