diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-09 03:51:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-09 03:51:54 +0200 |
| commit | 5c3e4797b68a6ecffd2eeafe1152da1f3cea344d (patch) | |
| tree | a8a566efa8082b8a64eb2374a180abe2a7796590 | |
| parent | ac10ac62c1e9b64280f3566425af08210d57bb04 (diff) | |
| parent | cb1af202be8bd4bdfe5d4864b9d4e70de1a3e516 (diff) | |
| download | samba-5c3e4797b68a6ecffd2eeafe1152da1f3cea344d.tar.gz samba-5c3e4797b68a6ecffd2eeafe1152da1f3cea344d.tar.bz2 samba-5c3e4797b68a6ecffd2eeafe1152da1f3cea344d.zip | |
Merge branch 'openchange' into cprovision
(This used to be commit 596fc05785020cd7bd6d15d91b49172039f83bab)
| -rw-r--r-- | source4/lib/events/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/talloc/config.mk | 3 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk index 1e402f80d6..225a23c634 100644 --- a/source4/lib/events/config.mk +++ b/source4/lib/events/config.mk @@ -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 ############################## diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 3eab90b9ae..42f8b38815 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -2,6 +2,3 @@ OUTPUT_TYPE = STATIC_LIBRARY OBJ_FILES = talloc.o CFLAGS = -Ilib/talloc - - -MANPAGES += $(tallocdir)/talloc.3 diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index b6f3fdac52..0a265c7004 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -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 >$@ |