diff options
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/config.mk | 25 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_ildap/config.mk | 3 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/config.mk | 10 |
3 files changed, 15 insertions, 23 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index d7e2d0f447..cc8f1e36ab 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -2,11 +2,11 @@ # Start MODULE ldb_asq [MODULE::ldb_asq] PRIVATE_DEPENDENCIES = LIBTALLOC +CFLAGS = -I$(ldbdir)/include INIT_FUNCTION = LDB_MODULE(asq) SUBSYSTEM = LIBLDB ldb_asq_OBJ_FILES = $(ldbdir)/modules/asq.o -$(ldb_asq_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include # End MODULE ldb_asq ################################################ @@ -14,61 +14,61 @@ $(ldb_asq_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include # Start MODULE ldb_server_sort [MODULE::ldb_server_sort] PRIVATE_DEPENDENCIES = LIBTALLOC +CFLAGS = -I$(ldbdir)/include INIT_FUNCTION = LDB_MODULE(server_sort) SUBSYSTEM = LIBLDB # End MODULE ldb_sort ################################################ ldb_server_sort_OBJ_FILES = $(ldbdir)/modules/sort.o -$(ldb_server_sort_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ################################################ # Start MODULE ldb_paged_results [MODULE::ldb_paged_results] INIT_FUNCTION = LDB_MODULE(paged_results) +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_paged_results ################################################ ldb_paged_results_OBJ_FILES = $(ldbdir)/modules/paged_results.o -$(ldb_paged_results_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ################################################ # Start MODULE ldb_paged_results [MODULE::ldb_paged_searches] INIT_FUNCTION = LDB_MODULE(paged_searches) +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_paged_results ################################################ ldb_paged_searches_OBJ_FILES = $(ldbdir)/modules/paged_searches.o -$(ldb_paged_searches_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ################################################ # Start MODULE ldb_operational [MODULE::ldb_operational] SUBSYSTEM = LIBLDB +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = LDB_MODULE(operational) # End MODULE ldb_operational ################################################ ldb_operational_OBJ_FILES = $(ldbdir)/modules/operational.o -$(ldb_operational_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ################################################ # Start MODULE ldb_rdn_name [MODULE::ldb_rdn_name] SUBSYSTEM = LIBLDB +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = LDB_MODULE(rdn_name) # End MODULE ldb_rdn_name ################################################ ldb_rdn_name_OBJ_FILES = $(ldbdir)/modules/rdn_name.o -$(ldb_rdn_name_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ldb_map_OBJ_FILES = $(addprefix $(ldbdir)/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o) @@ -78,40 +78,42 @@ $(ldb_map_OBJ_FILES): CFLAGS+=-I$(ldbdir)/ldb_map # Start MODULE ldb_skel [MODULE::ldb_skel] SUBSYSTEM = LIBLDB +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = LDB_MODULE(skel) # End MODULE ldb_skel ################################################ ldb_skel_OBJ_FILES = $(ldbdir)/modules/skel.o -$(ldb_skel_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ################################################ # Start MODULE ldb_sqlite3 [MODULE::ldb_sqlite3] SUBSYSTEM = LIBLDB +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC # End MODULE ldb_sqlite3 ################################################ ldb_sqlite3_OBJ_FILES = $(ldbdir)/ldb_sqlite3/ldb_sqlite3.o -$(ldb_sqlite3_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include ################################################ # Start MODULE ldb_tdb [MODULE::ldb_tdb] SUBSYSTEM = LIBLDB +CFLAGS = -I$(ldbdir)/include -I$(ldbdir)/ldb_tdb PRIVATE_DEPENDENCIES = \ LIBTDB LIBTALLOC # End MODULE ldb_tdb ################################################ ldb_tdb_OBJ_FILES = $(addprefix $(ldbdir)/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pack.o ldb_index.o ldb_cache.o ldb_tdb_wrap.o) -$(ldb_tdb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include -I$(ldbdir)/ldb_tdb + ################################################ # Start SUBSYSTEM ldb [LIBRARY::LIBLDB] +CFLAGS = -I$(ldbdir)/include INIT_FUNCTION_TYPE = extern const struct ldb_module_ops PUBLIC_DEPENDENCIES = \ LIBTALLOC @@ -143,7 +145,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbtest_OBJ_FILES = $(ldbdir)/tools/ldbtest.o -$(ldbtest_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) ################################################ # Start BINARY oLschema2ldif @@ -156,7 +157,6 @@ PRIVATE_DEPENDENCIES = \ oLschema2ldif_OBJ_FILES = $(addprefix $(ldbdir)/tools/, convert.o oLschema2ldif.o) -$(oLschema2ldif_OBJ_FILES): CFLAGS+=-I$(ldbdir) -I$(ldbdir)/include MANPAGES += $(ldbdir)/man/oLschema2ldif.1 @@ -170,11 +170,8 @@ PRIVATE_DEPENDENCIES = \ ################################################ ad2oLschema_OBJ_FILES = $(addprefix $(ldbdir)/tools/, convert.o ad2oLschema.o) -$(ad2oLschema_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ad2oLschema.1 mkinclude tools/config.mk mkinclude ldb_ildap/config.mk - -LDB_CFLAGS = -I$(ldbdir)/include diff --git a/source4/lib/ldb/ldb_ildap/config.mk b/source4/lib/ldb/ldb_ildap/config.mk index ed38b8a287..94e3380038 100644 --- a/source4/lib/ldb/ldb_ildap/config.mk +++ b/source4/lib/ldb/ldb_ildap/config.mk @@ -2,6 +2,7 @@ # Start MODULE ldb_ildap [MODULE::ldb_ildap] SUBSYSTEM = LIBLDB +CFLAGS = -I$(ldbdir)/include OUTPUT_TYPE = SHARED_LIBRARY PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS ALIASES = ldapi ldaps ldap @@ -9,4 +10,4 @@ ALIASES = ldapi ldaps ldap ################################################ ldb_ildap_OBJ_FILES = $(ldbdir)/ldb_ildap/ldb_ildap.o -$(ldb_ildap_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include + diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk index 5efbd20396..051fd0c57b 100644 --- a/source4/lib/ldb/tools/config.mk +++ b/source4/lib/ldb/tools/config.mk @@ -1,6 +1,7 @@ ################################################ # Start SUBSYSTEM LIBLDB_CMDLINE [SUBSYSTEM::LIBLDB_CMDLINE] +CFLAGS = -I$(ldbdir) -I$(ldbdir)/include PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec # End SUBSYSTEM LIBLDB_CMDLINE @@ -8,8 +9,6 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec LIBLDB_CMDLINE_OBJ_FILES = $(ldbdir)/tools/cmdline.o -$(LIBLDB_CMDLINE_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) - ################################################ # Start BINARY ldbadd [BINARY::ldbadd] @@ -19,8 +18,8 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbadd ################################################ + ldbadd_OBJ_FILES = $(ldbdir)/tools/ldbadd.o -$(ldbadd_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbadd.1 @@ -34,7 +33,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbdel_OBJ_FILES = $(ldbdir)/tools/ldbdel.o -$(ldbdel_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbdel.1 @@ -48,7 +46,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbmodify_OBJ_FILES = $(ldbdir)/tools/ldbmodify.o -$(ldbmodify_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbmodify.1 ################################################ @@ -61,7 +58,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbsearch_OBJ_FILES = $(ldbdir)/tools/ldbsearch.o -$(ldbsearch_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbsearch.1 @@ -75,7 +71,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbedit_OBJ_FILES = $(ldbdir)/tools/ldbedit.o -$(ldbedit_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbedit.1 @@ -89,7 +84,6 @@ PRIVATE_DEPENDENCIES = \ ################################################ ldbrename_OBJ_FILES = $(ldbdir)/tools/ldbrename.o -$(ldbrename_OBJ_FILES): CFLAGS+=-I$(ldbdir) $(LDB_CFLAGS) MANPAGES += $(ldbdir)/man/ldbrename.1 |