From e47e91e08a890cc0ac727985ba9352a579345ace Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Thu, 14 Jul 2011 13:37:43 +0200
Subject: Remove duplicated libodb-pgsql import stubs

---
 pgsql/native/makefile | 10 ++--------
 pgsql/types/makefile  |  8 ++------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pgsql/native/makefile b/pgsql/native/makefile
index 95eb060..5b85f42 100644
--- a/pgsql/native/makefile
+++ b/pgsql/native/makefile
@@ -17,17 +17,11 @@ dist    := $(out_base)/.dist
 test    := $(out_base)/.test
 clean   := $(out_base)/.clean
 
-# Import 
-#
-$(call import,\
-  $(scf_root)/import/libodb-pgsql/stub.make,\
-  l: odb_pgsql.l,cpp-options: odb_pgsql.l.cpp-options)
-
 # Build.
 #
-$(driver): $(cxx_obj) $(odb_pgsql.l) $(common.l)
+$(driver): $(cxx_obj) $(common.l)
 $(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(odb_pgsql.l.cpp-options) $(common.l.cpp-options)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
 
 $(call include-dep,$(cxx_od))
 
diff --git a/pgsql/types/makefile b/pgsql/types/makefile
index 88fdb4a..bdc00ea 100644
--- a/pgsql/types/makefile
+++ b/pgsql/types/makefile
@@ -24,15 +24,11 @@ $(call import,\
   $(scf_root)/import/odb/stub.make,\
   odb: odb,odb-rules: odb_rules)
 
-$(call import,\
-  $(scf_root)/import/libodb-pgsql/stub.make,\
-  l: odb_pgsql.l,cpp-options: odb_pgsql.l.cpp-options)
-
 # Build.
 #
-$(driver): $(cxx_obj) $(odb_pgsql.l) $(common.l)
+$(driver): $(cxx_obj) $(common.l)
 $(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(odb_pgsql.l.cpp-options) $(common.l.cpp-options)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
 
 genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql)
 gen  := $(addprefix $(out_base)/,$(genf))
-- 
cgit v1.1