X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=Makefile;h=1e310c3e11abbdb2ef167e80dd6759eab0756611;hp=1d9489b5812196f5336e1749535eb7aa2aac96f6;hb=fe77fc6b869a71bf94d501a0762579f4ddbc5094;hpb=53098601859a2ec9d70870735a805a1dcde17490

diff --git a/Makefile b/Makefile
index 1d9489b..1e310c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,39 @@
-LIBRARY		= framework
-LIBFILE		= libmspframework
+NAME		= core
 
-TMP		= $(HOME)/nightwatch/tmp
-TGT		= $(HOME)/nightwatch
+WORKDIR		= $(PWD)/../..
+TMP		= $(WORKDIR)/tmp/linux
+TGT		= $(HOME)/local
 
 CXX		= g++
 CC		= gcc
 AR		= ar
 CP		= cp
 
+LIBFILE		= libmsp$(NAME)
+
+MAKEFLAGS	+= -s --no-print-directory
 INCLUDE		= -Isource -I$(TMP)/include
 LIB		= -L$(TMP)
 DEBUG		= 
-CFLAGS		= $(DEBUG) $(INCLUDE) -pipe -Wall `pkg-config --cflags sigc++-2.0`
+CFLAGS		= $(DEBUG) $(INCLUDE) -pipe -Wall 
 CXXFLAGS	= $(CFLAGS)
-LIBLDFLAGS	= `pkg-config --libs sigc++-2.0`
-MAKEFLAGS	+= -s --no-print-directory
 
 PIC		= -fPIC
 SHARED		= .so
 STATIC		= .a
 
+override CFLAGS		+= `pkg-config --cflags sigc++-2.0`
+override LDFLAGS	+= `pkg-config --libs sigc++-2.0`
+override CXXFLAGS	+= `pkg-config --cflags sigc++-2.0`
+
 SRC		= source
-LIBOBJS		= $(addprefix $(TMP)/, $(addsuffix .o, $(notdir $(basename $(wildcard $(SRC)/*.cpp)))))
+SUBDIRS		= core time
+OBJS		= $(foreach SUBDIR, $(SUBDIRS), $(addprefix $(TMP)/$(SUBDIR)/, $(addsuffix .o, $(notdir $(basename $(wildcard $(SRC)/$(SUBDIR)/*.cpp))))))
 
-pkgincludedir	= include/msp/$(LIBRARY)
+pkgincludedir	= include/msp
 libdir		= lib
 
+foo = "echo $</$(SUBDIR); mkdir -p $</$(SUBDIR); $(CP) -r $(SRC)/$(SUBDIR)/*.h $</$(SUBDIR)"
 .PHONY: all
 all: $(TMP) $(TMP)/$(LIBFILE)$(SHARED) $(TMP)/$(LIBFILE)$(STATIC) tmpheaders
 
@@ -35,31 +42,36 @@ $(TMP):
 	mkdir -p $@
 
 # Dynamic library
-$(TMP)/$(LIBFILE)$(SHARED): $(LIBOBJS)
+$(TMP)/$(LIBFILE)$(SHARED): $(OBJS)
 	echo "Compiling $(notdir $@)"
-	$(CXX) $^ -shared -o $@	$(LIB) $(LIBLDFLAGS)
+	$(CXX) $^ -shared -o $@	$(LIB) $(LDFLAGS)
 
 # Static library
-$(TMP)/$(LIBFILE)$(STATIC): $(LIBOBJS)
+$(TMP)/$(LIBFILE)$(STATIC): $(OBJS)
 	echo "Compiling $(notdir $@)"
 	$(AR) rcs $@ $^
 
 # Copy headers to temp
 .PHONY: tmpheaders
 tmpheaders: $(TMP)/$(pkgincludedir)
-	$(CP) $(SRC)/*.h $<
+	$(foreach SUBDIR, $(SUBDIRS), \
+		mkdir -p $</$(SUBDIR) ; \
+		$(CP) -R $(SRC)/$(SUBDIR)/*.h $</$(SUBDIR) ; \
+	)
+#	$(foreach SUBDIR, $(SUBDIRS), $(CP) -r $(SRC)/$(SUBDIR)/*.h $</$(SUBDIR))
 
 $(TMP)/$(pkgincludedir):
 	mkdir -p $@
 
 # Library object file
 $(TMP)/%.o: $(SRC)/%.cpp $(wildcard $(SRC)/*.h)
-	echo "Compiling $(LIBRARY)/$(notdir $(basename $@))"
+	mkdir -p $(dir $@)
+	echo "Compiling $(NAME)/$(notdir $(basename $@))"
 	$(CXX) $(PIC) $(CXXFLAGS) -c $< -o $@
 
 # Installs
 .PHONY: install
-install: install_headers install_lib install_staticlib
+install: install_lib 
 
 $(TGT)/$(pkgincludedir):
 	mkdir -p $@
@@ -69,15 +81,15 @@ $(TGT)/$(libdir):
 
 .PHONY: install_headers
 install_headers: $(TGT)/$(pkgincludedir)
-	echo "Installing $(LIBRARY) headers to $<"
-	$(CP) $(SRC)/*.h $<
+	echo "Installing $(NAME) headers to $<"
+	$(foreach SUBDIR, $(SUBDIRS), $(CP) $(SRC)/$(SUBDIR)/*.h $</$(SUBDIR))
 
 .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) $<