X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=Makefile;h=9fe2580b6cc964b64f5a47d8c7997268b294461b;hp=b88954c35ffe0769c2682af2ef2042385b90252c;hb=0bcb8d4d6f33cbdad7b921cac787740bfe8e212e;hpb=668be7968f8327f3aa613189c4f7b43f377ffb07

diff --git a/Makefile b/Makefile
index b88954c..9fe2580 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+LIBRARY		= framework
+LIBFILE		= libmspframework
+
 TMP		= $(HOME)/nightwatch/tmp
 TGT		= $(HOME)/nightwatch
 
@@ -5,14 +8,19 @@ 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 `pkg-config --cflags sigc++-2.0`
 CXXFLAGS	= $(CFLAGS)
+LIBLDFLAGS	= `pkg-config --libs sigc++-2.0`
+MAKEFLAGS	+= -s --no-print-directory
+
+PIC		= -fPIC
+SHARED		= .so
+STATIC		= .a
 
-LIBRARY		= framework
-LIBFILE		= libmspframework
 SRC		= source
 LIBOBJS		= $(addprefix $(TMP)/, $(addsuffix .o, $(notdir $(basename $(wildcard $(SRC)/*.cpp)))))
 
@@ -20,19 +28,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) $(LIBLDFLAGS)
 
 # Static library
-$(TMP)/$(LIBFILE).a: $(LIBOBJS)
+$(TMP)/$(LIBFILE)$(STATIC): $(LIBOBJS)
 	echo "Compiling $(notdir $@)"
 	$(AR) rcs $@ $^
 
@@ -47,11 +55,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 +73,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) $<