From: Niko Liikanen Date: Thu, 24 Aug 2006 21:10:04 +0000 (+0000) Subject: static/shared lib extension tweaks X-Git-Tag: fs-1.0~24 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=1a9e1137302a33850f7ccd7b6fe1b4cfde7c6b3a;p=libs%2Fcore.git static/shared lib extension tweaks removed headers/static lib from install --- diff --git a/Makefile b/Makefile index d6e24b9..c316117 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ $(TMP)/%.o: $(SRC)/%.cpp $(wildcard $(SRC)/*.h) # Installs .PHONY: install -install: install_headers install_lib install_staticlib +install: install_lib $(TGT)/$(pkgincludedir): mkdir -p $@ @@ -72,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) $<