git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert "s3:Makefile: fix talloc dependencies with static build"
[samba.git] / source3 / Makefile.in
diff --git a/source3/Makefile.in b/source3/Makefile.in
index abd005a0ef6f28047fec66abd14cc4f9fc32bc75..6360b114b60a427f0de011b749f5e11257fe1053 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -79,7 +79,6 @@ POPT_LIBS=@POPTLIBS@
 LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
 LIBTDB_LIBS=@LIBTDB_LIBS@
 LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
-LIBLUA_LIBS=@LIBLUA_LIBS@
 LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
 LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
 
@@ -520,7 +519,8 @@ RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o \
                  $(SCHANNEL_OBJ)
 
 LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
-              $(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \
+              $(RPC_CLIENT_OBJ1) \
+              $(RPC_CLIENT_OBJ) \
               rpc_client/cli_spoolss.o \
               rpc_client/init_spoolss.o \
               rpc_client/init_samr.o \
@@ -593,6 +593,7 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
               $(REG_INIT_FULL_OBJ) \
               registry/reg_eventlog.o \
               registry/reg_perfcount.o \
+              librpc/gen_ndr/ndr_perfcount.o \
               registry/reg_util_legacy.o
 
 LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
@@ -997,7 +998,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
           $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
           utils/net_conf.o utils/net_join.o utils/net_user.o \
           utils/net_group.o utils/net_file.o utils/net_registry.o \
-          auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_lua.o \
+          auth/token_util.o utils/net_dom.o utils/net_share.o \
           utils/net_eventlog.o
 
 # these are not processed by make proto
@@ -1395,7 +1396,7 @@ samba3-idl::
        @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh \
                librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl \
-               librpc/idl/wbint.idl
+               librpc/idl/wbint.idl librpc/idl/perfcount.idl
 
 #####################################################################
 
@@ -1563,12 +1564,12 @@ bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_T
                $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/net@EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@ @LIBNETAPI_TARGET@ @LIBLUA_TARGET@
+bin/net@EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@ @LIBNETAPI_TARGET@
        @echo Linking $@
        @$(CC) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
                $(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
                $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
-               @INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBNETAPI_LIBS)  $(LIBLUA_LIBS) -lm \
+               $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBNETAPI_LIBS) \
                $(ZLIB_LIBS)
 
 bin/profiles@EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@@ -2349,7 +2350,6 @@ $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_O
        @echo Linking shared library $@
        @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
                $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-               $(KRB5LIBS) $(LDAP_LIBS) \
                @SONAMEFLAG@`basename $@`
 
 $(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
@@ -2427,87 +2427,6 @@ bin/libbigballofmud.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTAL
 # it can be fixed or if they just can't be called from a static
 # library.
 
-#-------------------------------------------------------------------
-#
-# libsmblua
-#
-#-------------------------------------------------------------------
-
-LIBLUA_OBJ0 = @LIBLUA_OBJ0@
-
-LIBLUA_OBJ = $(LIBLUA_OBJ0)
-
-LIBLUA_SHARED_TARGET=@LIBLUA_SHARED_TARGET@
-LIBLUA_SOVER=@LIBLUA_SOVER@
-LIBLUA_SHARED_TARGET_SONAME=$(LIBLUA_SHARED_TARGET).$(LIBLUA_SOVER)
-LIBLUA_STATIC_TARGET=@LIBLUA_STATIC_TARGET@
-LIBLUA=@LIBLUA_STATIC@ @LIBLUA_SHARED@
-LIBLUA_SYMS=$(srcdir)/exports/liblua.@SYMSEXT@
-LIBLUA_HEADERS=$(srcdir)/lua-5.1.4/src/lua.h
-
-$(LIBLUA_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBLUA_OBJ) $(LIBLUA_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
-       @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBLUA_OBJ) \
-               $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-               $(KRB5LIBS) $(LDAP_LIBS) \
-               @SONAMEFLAG@`basename $@`
-
-$(LIBLUA_SHARED_TARGET): $(LIBLUA_SHARED_TARGET_SONAME)
-       @rm -f $@
-       @ln -f -s `basename $(LIBLUA_SHARED_TARGET_SONAME)` $@
-
-$(LIBLUA_STATIC_TARGET): $(BINARY_PREREQS) $(LIBLUA_OBJ0)
-       @echo Linking non-shared library $@
-       @-$(AR) -rc $@ $(LIBLUA_OBJ0)
-
-liblua: $(LIBLUA)
-
-cleanliblua::
-       -rm -f \
-               $(LIBLUA_SHARED_TARGET) \
-               $(LIBLUA_SHARED_TARGET_SONAME) \
-               $(LIBLUA_STATIC_TARGET)
-
-installliblua:: installdirs liblua
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-       -$(INSTALLLIBCMD_SH) $(LIBLUA_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-       @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)`
-       -if test -f $(LIBLUA_SHARED_TARGET_SONAME) ; then \
-               ln -f -s `basename $(LIBLUA_SHARED_TARGET_SONAME)` \
-                       $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)` ; \
-       fi
-       -$(INSTALLLIBCMD_A) $(LIBLUA_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-       -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBLUA_HEADERS) $(DESTDIR)${prefix}/include
-
-uninstallliblua::
-       -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)`
-       -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET_SONAME)`
-       -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_STATIC_TARGET)`
-       -rm -f $(DESTDIR)${prefix}/include/smb_share_modes.h
-
-libs:: liblua
-installlibs:: @INSTALL_LIBLUA@
-uninstalllibs:: @UNINSTALL_LIBLUA@
-cleanlibs:: cleanliblua
-shlibs test_shlibs: @LIBLUA_SHARED@
-
-showliblua:
-       @echo  ""
-       @echo "LIBLUA_SHARED               = @LIBLUA_SHARED@"
-       @echo "LIBLUA_STATIC               = @LIBLUA_STATIC@"
-       @echo "LIBLUA_TARGET               = @LIBLUA_TARGET@"
-       @echo "LIBLUA_LIBS                 = $(LIBLUA_LIBS)"
-       @echo ""
-       @echo "LIBLUA_SHARED_TARGET        = $(LIBLUA_SHARED_TARGET)"
-       @echo "LIBLUA_SOVER                = $(LIBLUA_SOVER)"
-       @echo "LIBLUA_SHARED TARGET_SONAME = $(LIBLUA_SHARED_TARGET_SONAME)"
-       @echo "LIBLUA_STATIC_TARGET        = $(LIBLUA_STATIC_TARGET)"
-       @echo "LIBLUA                      = $(LIBLUA)"
-
-showlibs:: showliblua
-
-
 #####################################################################
 #
 # shared modules
Samba Shared Repository