# compilation, so they are safe
bld.env.public_headers_skip = ['param/param_proto.h', 'lib/ldb_compat.h']
-# force headers to use SAMBA4 rules
-bld.env.public_headers_replace = { '#if _SAMBA_BUILD_ == 4' : '#if 1 /* _SAMBA_BUILD_ == 4 */' }
-
samba_version.load_version(bld.env, is_install=bld.is_install)
bld.SAMBA_MKVERSION('version.h')
bld.RECURSE('lib/tevent')
bld.RECURSE('lib/ccan')
bld.RECURSE('lib/tdb_compat')
-bld.RECURSE('source4/lib/ldb')
+bld.RECURSE('lib/ldb')
+bld.RECURSE('lib/param')
bld.RECURSE('dynconfig')
bld.RECURSE('lib/util/charset')
bld.RECURSE('source4/scripting/python')
bld.RECURSE('nsswitch/libwbclient')
bld.RECURSE('source4/lib/samba3')
bld.RECURSE('source4/lib/socket')
-bld.RECURSE('source4/lib/ldb-samba')
+bld.RECURSE('lib/ldb-samba')
bld.RECURSE('source4/lib/tls')
bld.RECURSE('source4/lib/registry')
bld.RECURSE('source4/lib/messaging')
bld.RECURSE('source4/wrepl_server')
bld.RECURSE('source4/cldap_server')
bld.RECURSE('source4/ntp_signd')
-bld.RECURSE('source4/samba_tool')
bld.RECURSE('source4/utils')
bld.RECURSE('source4/ntvfs')
bld.RECURSE('source4/ntptr')
bld.RECURSE('testsuite/headers')
-# install some extra empty directories
-bld.INSTALL_DIRS("", "${LOCKDIR} ${STATEDIR} ${CACHEDIR} ${SWATDIR} ${SYSCONFDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging ${CODEPAGEDIR} ${LOGFILEBASE} ${SETUPDIR}")
-
bld.SYMBOL_CHECK()