mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
Merge branch 'openchange' into cprovision
(This used to be commit 596fc05785
)
This commit is contained in:
commit
5c3e4797b6
@ -30,11 +30,9 @@ INIT_FUNCTION = s4_events_standard_init
|
||||
|
||||
##############################
|
||||
# Start SUBSYSTEM LIBEVENTS
|
||||
[LIBRARY::LIBEVENTS]
|
||||
[SUBSYSTEM::LIBEVENTS]
|
||||
OBJ_FILES = events.o events_timed.o events_signal.o
|
||||
PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
|
||||
SO_VERSION = 0
|
||||
VERSION = 0.0.1
|
||||
# End SUBSYSTEM LIBEVENTS
|
||||
##############################
|
||||
|
||||
|
@ -2,6 +2,3 @@
|
||||
OUTPUT_TYPE = STATIC_LIBRARY
|
||||
OBJ_FILES = talloc.o
|
||||
CFLAGS = -Ilib/talloc
|
||||
|
||||
|
||||
MANPAGES += $(tallocdir)/talloc.3
|
||||
|
@ -286,8 +286,6 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
|
||||
OBJ_FILES = gen_ndr/ndr_winbind.o
|
||||
PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
|
||||
|
||||
PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
|
||||
|
||||
librpc/idl-deps:
|
||||
./librpc/idl-deps.pl librpc/idl/*.idl >$@
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user