diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 19:46:11 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 19:46:11 +0200 |
| commit | 7e239a15b316deb83cbdcb79e392f6aefe289114 (patch) | |
| tree | 5032c55084f2cfe0648f12bd54a8e390dc5b2112 | |
| parent | 7979cae206cd1e1e352f32fba6165aa3b56f4add (diff) | |
| download | samba-7e239a15b316deb83cbdcb79e392f6aefe289114.tar.gz samba-7e239a15b316deb83cbdcb79e392f6aefe289114.tar.bz2 samba-7e239a15b316deb83cbdcb79e392f6aefe289114.zip | |
Revert accidental changes to lib/basic.mk.
| -rw-r--r-- | source4/lib/basic.mk | 28 | ||||
| -rwxr-xr-x | source4/librpc/scripts/build_idl.sh | 2 |
2 files changed, 4 insertions, 26 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 999ed7717e..4d076684cd 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -1,28 +1,6 @@ -# LIB BASIC subsystem -mkinclude samba3/config.mk -mkinclude socket/config.mk -mkinclude charset/config.mk -mkinclude ldb-samba/config.mk -mkinclude tls/config.mk -mkinclude registry/config.mk -mkinclude messaging/config.mk -mkinclude events/config.mk -mkinclude cmdline/config.mk -mkinclude socket_wrapper/config.mk -mkinclude nss_wrapper/config.mk -mkinclude appweb/config.mk -mkinclude stream/config.mk -mkinclude util/config.mk -mkinclude tdr/config.mk -mkinclude dbwrap/config.mk -mkinclude crypto/config.mk -mkinclude torture/config.mk -mkinclude com/config.mk -mkinclude wmi/config.mk - -[SUBSYSTEM::LIBCOMPRESSION] - -LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o +[SUBSYSTEM::LZXPRESS] + +LZXPRESS_OBJ_FILES = $(libcompressionsrcdir)/lzxpress.o [SUBSYSTEM::GENCACHE] PRIVATE_DEPENDENCIES = TDB_WRAP diff --git a/source4/librpc/scripts/build_idl.sh b/source4/librpc/scripts/build_idl.sh index 5b2d09f654..8aa93942b9 100755 --- a/source4/librpc/scripts/build_idl.sh +++ b/source4/librpc/scripts/build_idl.sh @@ -8,7 +8,7 @@ PIDL_EXTRA_ARGS="$*" [ -d $OUTDIR ] || mkdir -p $OUTDIR || exit 1 -PIDL="$PIDL --outputdir $OUTDIR --header --ndr-parser --server --client --swig --python --dcom-proxy --com-header $PIDL_EXTRA_ARGS" +PIDL="$PIDL --outputdir $OUTDIR --header --ndr-parser --server --client --swig --python --dcom-proxy --com-header -- $PIDL_EXTRA_ARGS" if [ x$FULLBUILD = xFULL ]; then echo Rebuilding all idl files in $IDLDIR |