aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/auto/makefile2
-rw-r--r--common/composite/makefile2
-rw-r--r--common/const/makefile2
-rw-r--r--common/container/makefile2
-rw-r--r--common/ctor/makefile2
-rw-r--r--common/inverse/makefile2
-rw-r--r--common/lazy-ptr/makefile2
-rw-r--r--common/lifecycle/makefile2
-rw-r--r--common/makefile2
-rw-r--r--common/query/makefile2
-rw-r--r--common/relationship/makefile2
-rw-r--r--common/schema/makefile2
-rw-r--r--common/template/makefile2
-rw-r--r--common/template/template-vc10.vcxproj18
-rw-r--r--common/template/template-vc9.vcproj18
-rw-r--r--common/threads/makefile2
16 files changed, 32 insertions, 32 deletions
diff --git a/common/auto/makefile b/common/auto/makefile
index 896b19f..64e7d50 100644
--- a/common/auto/makefile
+++ b/common/auto/makefile
@@ -47,7 +47,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/composite/makefile b/common/composite/makefile
index 48a1a17..1ffb7c4 100644
--- a/common/composite/makefile
+++ b/common/composite/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/const/makefile b/common/const/makefile
index aeb4bdb..0314fbe 100644
--- a/common/const/makefile
+++ b/common/const/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/container/makefile b/common/container/makefile
index fe97426..2a95b15 100644
--- a/common/container/makefile
+++ b/common/container/makefile
@@ -47,7 +47,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/ctor/makefile b/common/ctor/makefile
index 9949e59..9eb8097 100644
--- a/common/ctor/makefile
+++ b/common/ctor/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/inverse/makefile b/common/inverse/makefile
index 4025fee..d0185ad 100644
--- a/common/inverse/makefile
+++ b/common/inverse/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile
index 8097d52..f8c46af 100644
--- a/common/lazy-ptr/makefile
+++ b/common/lazy-ptr/makefile
@@ -47,7 +47,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile
index a6dd68b..346a6cd 100644
--- a/common/lifecycle/makefile
+++ b/common/lifecycle/makefile
@@ -47,7 +47,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/makefile b/common/makefile
index 5a9b9cd..c3f02bf 100644
--- a/common/makefile
+++ b/common/makefile
@@ -31,7 +31,7 @@ clean := $(out_base)/.clean
$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
-name := $(notdir $(src_base))
+name := common
$(dist): name := $(name)
$(dist): export dirs := $(tests)
$(dist): export thread_dirs := $(thread_tests)
diff --git a/common/query/makefile b/common/query/makefile
index 440a173..2866b92 100644
--- a/common/query/makefile
+++ b/common/query/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/relationship/makefile b/common/relationship/makefile
index 94d70b8..6b07c17 100644
--- a/common/relationship/makefile
+++ b/common/relationship/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/schema/makefile b/common/schema/makefile
index ae36fa4..9e6f616 100644
--- a/common/schema/makefile
+++ b/common/schema/makefile
@@ -47,7 +47,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/template/makefile b/common/template/makefile
index b4c20fc..35da3c2 100644
--- a/common/template/makefile
+++ b/common/template/makefile
@@ -47,7 +47,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/common/template/template-vc10.vcxproj b/common/template/template-vc10.vcxproj
index e49d337..b068c05 100644
--- a/common/template/template-vc10.vcxproj
+++ b/common/template/template-vc10.vcxproj
@@ -89,11 +89,11 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
@@ -105,11 +105,11 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
@@ -123,11 +123,11 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -143,11 +143,11 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -158,7 +158,7 @@
__custom_build_entry__(
test.hxx,
odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
test-odb.hxx;test-odb.ixx;test-odb.cxx)
</ItemGroup>
<ItemGroup>
diff --git a/common/template/template-vc9.vcproj b/common/template/template-vc9.vcproj
index d6dbd3b..cd79624 100644
--- a/common/template/template-vc9.vcproj
+++ b/common/template/template-vc9.vcproj
@@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="0"
- AdditionalIncludeDirectories="..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-d.lib"
+ AdditionalDependencies="$(SolutionDir)\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-d.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -122,7 +122,7 @@
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\libcommon\lib\common.lib odb-__value__(database).lib odb.lib"
+ AdditionalDependencies="$(SolutionDir)\..\libcommon\lib\common.lib odb-__value__(database).lib odb.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -199,7 +199,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="0"
- AdditionalIncludeDirectories="..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -219,7 +219,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-d.lib"
+ AdditionalDependencies="$(SolutionDir)\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-d.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -277,7 +277,7 @@
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -296,7 +296,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\libcommon\lib64\common.lib odb-__value__(database).lib odb.lib"
+ AdditionalDependencies="$(SolutionDir)\..\libcommon\lib64\common.lib odb-__value__(database).lib odb.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -348,7 +348,7 @@ __source_entries__(extra_sources)
__file_entry_custom_build__(
test.hxx,
odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
test-odb.hxx;test-odb.ixx;test-odb.cxx)
__file_entry__(test-odb.hxx)
__file_entry__(test-odb.ixx)
diff --git a/common/threads/makefile b/common/threads/makefile
index 5ff53e8..44c2a06 100644
--- a/common/threads/makefile
+++ b/common/threads/makefile
@@ -48,7 +48,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
generated by cgit v1.1 at 2024-11-02 04:27:15 +0000