diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-31 02:17:29 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-31 02:01:44 +0000 |
commit | 3deece559159150a0710d8160f39583ba7f2e582 (patch) | |
tree | 861600d7060d1ca8764c26f7ecc2cb82a4a44bec /libcli | |
parent | 9401189d5435632bcc6a177845ce03beaa804113 (diff) | |
download | samba-3deece559159150a0710d8160f39583ba7f2e582.tar.gz samba-3deece559159150a0710d8160f39583ba7f2e582.tar.bz2 samba-3deece559159150a0710d8160f39583ba7f2e582.zip |
s4: Remove the old perl/m4/make/mk-based build system.
The new waf-based build system now has all the same functionality, and
the old build system has been broken for quite some time.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104
Diffstat (limited to 'libcli')
-rw-r--r-- | libcli/auth/config.mk | 26 | ||||
-rw-r--r-- | libcli/cldap/config.mk | 7 | ||||
-rw-r--r-- | libcli/drsuapi/config.mk | 6 | ||||
-rw-r--r-- | libcli/ldap/config.mk | 15 | ||||
-rw-r--r-- | libcli/named_pipe_auth/config.mk | 4 | ||||
-rw-r--r-- | libcli/nbt/config.mk | 51 | ||||
-rw-r--r-- | libcli/samsync/config.mk | 6 | ||||
-rw-r--r-- | libcli/security/config.mk | 5 | ||||
-rw-r--r-- | libcli/smb/config.mk | 11 | ||||
-rw-r--r-- | libcli/smbreadline/readline.m4 | 96 |
10 files changed, 0 insertions, 227 deletions
diff --git a/libcli/auth/config.mk b/libcli/auth/config.mk deleted file mode 100644 index bc198f3f8e..0000000000 --- a/libcli/auth/config.mk +++ /dev/null @@ -1,26 +0,0 @@ -[SUBSYSTEM::ntlm_check] -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL - -ntlm_check_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, ntlm_check.o) - -[SUBSYSTEM::MSRPC_PARSE] - -MSRPC_PARSE_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, msrpc_parse.o) - -[SUBSYSTEM::LIBCLI_AUTH] -PUBLIC_DEPENDENCIES = \ - MSRPC_PARSE \ - LIBSAMBA-HOSTCONFIG - -LIBCLI_AUTH_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, \ - credentials.o \ - session.o \ - smbencrypt.o \ - smbdes.o) - -PUBLIC_HEADERS += ../libcli/auth/credentials.h - -[SUBSYSTEM::COMMON_SCHANNELDB] -PRIVATE_DEPENDENCIES = TDB_WRAP - -COMMON_SCHANNELDB_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/auth/, schannel_state_tdb.o) diff --git a/libcli/cldap/config.mk b/libcli/cldap/config.mk deleted file mode 100644 index a4a75b4909..0000000000 --- a/libcli/cldap/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -[SUBSYSTEM::LIBCLI_CLDAP] -PUBLIC_DEPENDENCIES = LIBCLI_LDAP -PRIVATE_DEPENDENCIES = LIBTSOCKET LIBSAMBA-UTIL UTIL_TEVENT LIBLDB LIBCLI_NETLOGON - -LIBCLI_CLDAP_OBJ_FILES = ../libcli/cldap/cldap.o -# PUBLIC_HEADERS += ../libcli/cldap/cldap.h - diff --git a/libcli/drsuapi/config.mk b/libcli/drsuapi/config.mk deleted file mode 100644 index 4c68702280..0000000000 --- a/libcli/drsuapi/config.mk +++ /dev/null @@ -1,6 +0,0 @@ -[SUBSYSTEM::LIBCLI_DRSUAPI] -PUBLIC_DEPENDENCIES = \ - LIBCLI_AUTH - -LIBCLI_DRSUAPI_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/drsuapi/, \ - repl_decrypt.o) diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk deleted file mode 100644 index 22cad8cfbc..0000000000 --- a/libcli/ldap/config.mk +++ /dev/null @@ -1,15 +0,0 @@ -[SUBSYSTEM::LIBCLI_LDAP_MESSAGE] -PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBLDB -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL ASN1_UTIL - -LIBCLI_LDAP_MESSAGE_OBJ_FILES = $(addprefix ../libcli/ldap/, \ - ldap_message.o) -PUBLIC_HEADERS += ../libcli/ldap/ldap_message.h ../libcli/ldap/ldap_errors.h - -[SUBSYSTEM::LIBCLI_LDAP_NDR] -PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB NDR_MISC NDR_SECURITY - -LIBCLI_LDAP_NDR_OBJ_FILES = ../libcli/ldap/ldap_ndr.o -PUBLIC_HEADERS += ../libcli/ldap/ldap_ndr.h - diff --git a/libcli/named_pipe_auth/config.mk b/libcli/named_pipe_auth/config.mk deleted file mode 100644 index 6d44ef4141..0000000000 --- a/libcli/named_pipe_auth/config.mk +++ /dev/null @@ -1,4 +0,0 @@ -[SUBSYSTEM::NAMED_PIPE_AUTH_TSTREAM] -PUBLIC_DEPENDENCIES = NDR_NAMED_PIPE_AUTH TEVENT TSOCKET - -NAMED_PIPE_AUTH_TSTREAM_OBJ_FILES = ../libcli/named_pipe_auth/npa_tstream.o diff --git a/libcli/nbt/config.mk b/libcli/nbt/config.mk deleted file mode 100644 index 14af80e172..0000000000 --- a/libcli/nbt/config.mk +++ /dev/null @@ -1,51 +0,0 @@ -[SUBSYSTEM::NDR_NBT_BUF] - -NDR_NBT_BUF_OBJ_FILES = $(libclinbtsrcdir)/nbtname.o - -$(eval $(call proto_header_template,$(libclinbtsrcdir)/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c))) - -[SUBSYSTEM::LIBCLI_NBT] -PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \ - NDR_SECURITY samba_socket LIBSAMBA-UTIL - -LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \ - lmhosts.o \ - dns_hosts_file.o \ - nbtsocket.o \ - namequery.o \ - nameregister.o \ - namerefresh.o \ - namerelease.o) - -[BINARY::nmblookup] -INSTALLDIR = BINDIR -PRIVATE_DEPENDENCIES = \ - LIBSAMBA-HOSTCONFIG \ - LIBSAMBA-UTIL \ - LIBCLI_NBT \ - LIBPOPT \ - POPT_SAMBA \ - LIBNETIF \ - LIBCLI_RESOLVE - -nmblookup_OBJ_FILES = $(libclinbtsrcdir)/tools/nmblookup.o -MANPAGES += $(libclinbtsrcdir)/man/nmblookup.1 - -[SUBSYSTEM::LIBCLI_NDR_NETLOGON] -PUBLIC_DEPENDENCIES = LIBNDR \ - NDR_SECURITY - -LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/../, ndr_netlogon.o) - -[SUBSYSTEM::LIBCLI_NETLOGON] -PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON - -LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \ - ../netlogon.o) - -[PYTHON::python_netbios] -LIBRARY_REALNAME = samba/netbios.$(SHLIBEXT) -PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG - -python_netbios_OBJ_FILES = $(libclinbtsrcdir)/pynbt.o - diff --git a/libcli/samsync/config.mk b/libcli/samsync/config.mk deleted file mode 100644 index bea909e398..0000000000 --- a/libcli/samsync/config.mk +++ /dev/null @@ -1,6 +0,0 @@ -[SUBSYSTEM::LIBCLI_SAMSYNC] -PUBLIC_DEPENDENCIES = \ - LIBCLI_AUTH - -LIBCLI_SAMSYNC_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/samsync/, \ - decrypt.o) diff --git a/libcli/security/config.mk b/libcli/security/config.mk deleted file mode 100644 index 2a0ce0510f..0000000000 --- a/libcli/security/config.mk +++ /dev/null @@ -1,5 +0,0 @@ -[SUBSYSTEM::LIBSECURITY_COMMON] -PRIVATE_DEPENDENCIES = TALLOC - -LIBSECURITY_COMMON_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/security/, \ - dom_sid.o display_sec.o secace.o secacl.o security_descriptor.o sddl.o) diff --git a/libcli/smb/config.mk b/libcli/smb/config.mk deleted file mode 100644 index 57c25c3844..0000000000 --- a/libcli/smb/config.mk +++ /dev/null @@ -1,11 +0,0 @@ -# common SMB and SMB2 stuff -[SUBSYSTEM::LIBCLI_SMB_COMMON] -PUBLIC_DEPENDENCIES = LIBTALLOC - -LIBCLI_SMB_COMMON_OBJ_FILES = $(addprefix ../libcli/smb/, \ - smb2_create_blob.o) - -$(eval $(call proto_header_template, \ - ../libcli/smb/smb_common_proto.h, \ - $(LIBCLI_SMB_COMMON_OBJ_FILES:.o=.c))) - diff --git a/libcli/smbreadline/readline.m4 b/libcli/smbreadline/readline.m4 deleted file mode 100644 index f450cacac9..0000000000 --- a/libcli/smbreadline/readline.m4 +++ /dev/null @@ -1,96 +0,0 @@ -############################################### -# Readline included by default unless explicitly asked not to -test "${with_readline+set}" != "set" && with_readline=yes - -EXTERNAL_READLINE=no -# test for where we get readline() from -AC_MSG_CHECKING(whether to use readline) -AC_ARG_WITH(readline, -[AS_HELP_STRING([--with-readline[=DIR]], [Look for readline include/libs in DIR (default=auto)])], -[ case "$with_readline" in - yes) - AC_MSG_RESULT(yes) - - AC_CHECK_HEADERS(readline.h history.h readline/readline.h) - AC_CHECK_HEADERS(readline/history.h) - - AC_CHECK_HEADERS(readline.h readline/readline.h,[ - for termlib in ncurses curses termcap terminfo termlib tinfo; do - AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break]) - done - AC_CHECK_LIB(readline, rl_callback_handler_install, - [TERMLIBS="-lreadline $TERMLIBS" - EXTERNAL_READLINE=yes - break], [TERMLIBS=], $TERMLIBS)]) - ;; - no) - AC_MSG_RESULT(no) - ;; - *) - AC_MSG_RESULT(yes) - - # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at - # alternate readline path - _ldflags=${LDFLAGS} - _cppflags=${CPPFLAGS} - - # Add additional search path - LDFLAGS="-L$with_readline/lib $LDFLAGS" - CPPFLAGS="-I$with_readline/include $CPPFLAGS" - - AC_CHECK_HEADERS(readline.h history.h readline/readline.h) - AC_CHECK_HEADERS(readline/history.h) - - AC_CHECK_HEADERS(readline.h readline/readline.h,[ - for termlib in ncurses curses termcap terminfo termlib; do - AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break]) - done - AC_CHECK_LIB(readline, rl_callback_handler_install, - [TERMLDFLAGS="-L$with_readline/lib" - TERMCPPFLAGS="-I$with_readline/include" - LDFLAGS="-L$with_readline/lib $LDFLAGS" - CPPFLAGS="-I$with_readline/include $CPPFLAGS" - TERMLIBS="-lreadline $TERMLIBS" - EXTERNAL_READLINE=yes - break], [TERMLIBS= CPPFLAGS=$_cppflags], $TERMLIBS)]) - - ;; - esac], - AC_MSG_RESULT(no) -) - -# The readline API changed slightly from readline3 to readline4, so -# code will generate warnings on one of them unless we have a few -# special cases. -AC_CHECK_LIB(readline, rl_completion_matches, - [AC_DEFINE(HAVE_NEW_LIBREADLINE, 1, - [Do we have rl_completion_matches?])], - [], - [$TERMLIBS]) - -# not all readline libs have rl_event_hook or history_list -AC_CHECK_DECLS(rl_event_hook, [], [], [ - #include <stdio.h> - #include <readline/readline.h> -]) -AC_CHECK_LIB(readline, history_list, - [AC_DEFINE(HAVE_HISTORY_LIST, 1, [Do we have history_list?])], - [], - [$TERMLIBS]) - -AC_CHECK_LIB(readline, add_history, - [AC_DEFINE(HAVE_ADD_HISTORY, 1, [Do we have add_history?])], - [], - [$TERMLIBS]) - -AC_MSG_CHECKING(whether to use extern readline) -if test x"$EXTERNAL_READLINE" = x"yes"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) - SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], [READLINE]) - SMB_EXT_LIB(READLINE, [${TERMLIBS}]) - SMB_ENABLE(READLINE,YES) -else - SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], []) - AC_MSG_RESULT(no) -fi |