[complement-svn] SF.net SVN: complement: [1786] trunk/complement/explore/Makefiles

[<com...@us...>]

Revision: 1786
          http://complement.svn.sourceforge.net/complement/?rev=1786&view=rev
Author:   complement
Date:     2007-11-13 05:17:44 -0800 (Tue, 13 Nov 2007)

Log Message:
-----------
add macro LIBPREFIX to allow build shared object with name satisfied to plug-in

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/ChangeLog
    trunk/complement/explore/Makefiles/gmake/unix/lib.mak

Added Paths:
-----------
    trunk/complement/explore/Makefiles/ut/somodule/
    trunk/complement/explore/Makefiles/ut/somodule/Makefile
    trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc
    trunk/complement/explore/Makefiles/ut/somodule/test_c.cc
    trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc

Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog	2007-10-31 18:36:41 UTC (rev 1785)
+++ trunk/complement/explore/Makefiles/ChangeLog	2007-11-13 13:17:44 UTC (rev 1786)
@@ -1,3 +1,10 @@
+2007-11-13  Petr Ovtchenkov  <pt...@is...>
+
+	* gmake/unix/lib.mak: add macro LIBPREFIX to allow build shared
+	objects with names satisfied plug-in customs;
+
+	* ut/somodule: test for feature above.
+
 2007-08-30  Petr Ovtchenkov  <pt...@is...>
 
 	* gmake/sysid.mak, gmake/app/gcc.mak, gmake/lib/gcc.mak:

Modified: trunk/complement/explore/Makefiles/gmake/unix/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/lib.mak	2007-10-31 18:36:41 UTC (rev 1785)
+++ trunk/complement/explore/Makefiles/gmake/unix/lib.mak	2007-11-13 13:17:44 UTC (rev 1786)
@@ -1,6 +1,6 @@
 # -*- makefile -*- Time-stamp: <06/11/02 10:37:02 ptr>
 #
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
 # Petr Ovtchenkov
 #
 # Portion Copyright (c) 1999-2001
@@ -11,10 +11,11 @@
 
 DBG_SUFFIX ?= g
 STLDBG_SUFFIX ?= stl${DBG_SUFFIX}
+LIBPREFIX ?= lib
 
 # Shared libraries:
 
-SO_NAME        := lib${LIBNAME}.$(SO)
+SO_NAME        := ${LIBPREFIX}${LIBNAME}.$(SO)
 SO_NAMEx       := ${SO_NAME}.${MAJOR}
 SO_NAMExx      := ${SO_NAMEx}.${MINOR}
 SO_NAMExxx     := ${SO_NAMExx}.${PATCH}
@@ -24,7 +25,7 @@
 SO_NAME_OUTxx  := $(OUTPUT_DIR)/${SO_NAMExx}
 SO_NAME_OUTxxx := $(OUTPUT_DIR)/${SO_NAMExxx}
 
-SO_NAME_DBG    := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
+SO_NAME_DBG    := ${LIBPREFIX}${LIBNAME}${DBG_SUFFIX}.$(SO)
 SO_NAME_DBGx   := ${SO_NAME_DBG}.${MAJOR}
 SO_NAME_DBGxx  := ${SO_NAME_DBGx}.${MINOR}
 SO_NAME_DBGxxx := ${SO_NAME_DBGxx}.${PATCH}
@@ -35,7 +36,7 @@
 SO_NAME_OUT_DBGxxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxxx}
 
 ifndef WITHOUT_STLPORT
-SO_NAME_STLDBG    := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
+SO_NAME_STLDBG    := ${LIBPREFIX}${LIBNAME}${STLDBG_SUFFIX}.$(SO)
 SO_NAME_STLDBGx   := ${SO_NAME_STLDBG}.${MAJOR}
 SO_NAME_STLDBGxx  := ${SO_NAME_STLDBGx}.${MINOR}
 SO_NAME_STLDBGxxx := ${SO_NAME_STLDBGxx}.${PATCH}
@@ -49,13 +50,13 @@
 
 # Static libraries:
 
-A_NAME := lib${LIBNAME}.$(ARCH)
+A_NAME := ${LIBPREFIX}${LIBNAME}.$(ARCH)
 A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
 
-A_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(ARCH)
+A_NAME_DBG := ${LIBPREFIX}${LIBNAME}${DBG_SUFFIX}.$(ARCH)
 A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
 
 ifndef WITHOUT_STLPORT
-A_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(ARCH)
+A_NAME_STLDBG := ${LIBPREFIX}${LIBNAME}${STLDBG_SUFFIX}.$(ARCH)
 A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
 endif


Property changes on: trunk/complement/explore/Makefiles/ut/somodule
___________________________________________________________________
Name: svn:ignore
   + obj


Added: trunk/complement/explore/Makefiles/ut/somodule/Makefile
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/Makefile	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/Makefile	2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,18 @@
+# -*- Makefile -*- Time-stamp: <06/11/10 16:23:01 ptr>
+
+SRCROOT := ../../..
+EXTRA_POST := checks
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/gmake/top.mak
+
+INCLUDES += -I./include
+
+checks:
+	file ${SO_NAME_OUTxxx} | grep ELF >/dev/null || exit 1
+	file ${SO_NAME_OUTxx} | grep link >/dev/null || exit 1
+	file ${SO_NAME_OUTx} | grep link >/dev/null || exit 1
+	file ${SO_NAME_OUT} | grep link >/dev/null || exit 1
+
+PHONY += checks
+

Added: trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc	2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,9 @@
+# -*- Makefile -*- Time-stamp: <06/11/29 01:59:50 ptr>
+
+LIBPREFIX :=
+LIBNAME = test
+MAJOR = 0
+MINOR = 1
+PATCH = 2
+SRC_CC = test_cc.cc
+SRC_C = test_c.c

Added: trunk/complement/explore/Makefiles/ut/somodule/test_c.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/test_c.cc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/test_c.cc	2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,4 @@
+int g()
+{
+  return 0;
+}

Added: trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc	                        (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc	2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,4 @@
+int f()
+{
+  return 0;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.