diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 21 | ||||
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 14 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldb.3.xml (renamed from source4/lib/ldb/man/man3/ldb.3.xml) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldbadd.1.xml (renamed from source4/lib/ldb/man/man1/ldbadd.1.xml) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldbdel.1.xml (renamed from source4/lib/ldb/man/man1/ldbdel.1.xml) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldbedit.1.xml (renamed from source4/lib/ldb/man/man1/ldbedit.1.xml) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldbmodify.1.xml (renamed from source4/lib/ldb/man/man1/ldbmodify.1.xml) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldbrename.1.xml (renamed from source4/lib/ldb/man/man1/ldbrename.1.xml) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/man/ldbsearch.1.xml (renamed from source4/lib/ldb/man/man1/ldbsearch.1.xml) | 0 |
10 files changed, 23 insertions, 14 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index fc4c7fd2b9..34fa0c9f65 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -653,18 +653,21 @@ LDB_PROGS = bin/ldbadd \ REG_PROGS = bin/regpatch \ bin/regshell \ bin/regtree \ - bin/regpatch \ bin/regdiff -install: showlayout installbin installtorture installldb installreg installdat installswat +GTK_PROGS = bin/gregedit \ + bin/gwsam \ + bin/gepdump + +install: showlayout installbin installtorture installldb installreg installdat installswat installgtk # DESTDIR is used here to prevent packagers wasting their time -# duplicating the Makefile. Remove it and you will have the privelege -# of package each samba release for muliple versions of multiple +# duplicating the Makefile. Remove it and you will have the privilege +# of package each samba release for multiple versions of multiple # distributions and operating systems, or at least supplying patches # to all the packaging files required for this, prior to committing # the removal of DESTDIR. Do not remove it even though you think it -# is not used +# is not used. installdirs: @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls @@ -682,6 +685,9 @@ installldb: all installdirs installreg: all installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(REG_PROGS) +installgtk: all installdirs + @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(GTK_PROGS) + installdat: installdirs @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir) @@ -691,7 +697,7 @@ installswat: installdirs installman: installdirs @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES) -uninstall: uninstallbin uninstalltorture uninstallldb uninstallreg +uninstall: uninstallbin uninstalltorture uninstallldb uninstallreg uninstallgtk uninstallbin: @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(SBIN_PROGS) @@ -705,6 +711,9 @@ uninstallldb: uninstallreg: @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(REG_PROGS) +uninstallgtk: + @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(GTK_PROGS) + uninstallman: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(MANPAGES) diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index ac3155f27e..4a065ba83f 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -112,7 +112,7 @@ bin/ldbtest: tools/ldbtest.o tools/cmdline.o $(LIBS) %.html: %.xml test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< -manpages: $(patsubst %.xml,%,$(wildcard man/*/*.xml)) +manpages: $(patsubst %.xml,%,$(wildcard man/*.xml)) clean: rm -f */*.o *.gcov */*.gc?? *~ */*~ $(BINS) $(TDB_OBJ) $(TALLOC_OBJ) $(LDB_LIB) man/man?/*.[13] diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 39de5ea1c0..691af8bcfa 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -74,7 +74,7 @@ ADD_OBJ_FILES = \ REQUIRED_SUBSYSTEMS = \ LIBREPLACE LIBTALLOC LDBSAMBA NOPROTO = YES -MANPAGE = lib/ldb/man/man3/ldb.3 +MANPAGE = lib/ldb/man/ldb.3 # # End SUBSYSTEM LIBLDB ################################################ @@ -115,7 +115,7 @@ OBJ_FILES = \ lib/ldb/tools/ldbadd.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/man1/ldbadd.1 +MANPAGE = lib/ldb/man/ldbadd.1 # End BINARY ldbadd ################################################ @@ -126,7 +126,7 @@ OBJ_FILES= \ lib/ldb/tools/ldbdel.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/man1/ldbdel.1 +MANPAGE = lib/ldb/man/ldbdel.1 # End BINARY ldbdel ################################################ @@ -137,7 +137,7 @@ OBJ_FILES= \ lib/ldb/tools/ldbmodify.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/man1/ldbmodify.1 +MANPAGE = lib/ldb/man/ldbmodify.1 # End BINARY ldbmodify ################################################ @@ -148,7 +148,7 @@ OBJ_FILES= \ lib/ldb/tools/ldbsearch.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/man1/ldbsearch.1 +MANPAGE = lib/ldb/man/ldbsearch.1 # End BINARY ldbsearch ################################################ @@ -159,7 +159,7 @@ OBJ_FILES= \ lib/ldb/tools/ldbedit.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/man1/ldbedit.1 +MANPAGE = lib/ldb/man/ldbedit.1 # End BINARY ldbedit ################################################ @@ -170,7 +170,7 @@ OBJ_FILES= \ lib/ldb/tools/ldbrename.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/man1/ldbrename.1 +MANPAGE = lib/ldb/man/ldbrename.1 # End BINARY ldbrename ################################################ diff --git a/source4/lib/ldb/man/man3/ldb.3.xml b/source4/lib/ldb/man/ldb.3.xml index d9ed135f20..d9ed135f20 100644 --- a/source4/lib/ldb/man/man3/ldb.3.xml +++ b/source4/lib/ldb/man/ldb.3.xml diff --git a/source4/lib/ldb/man/man1/ldbadd.1.xml b/source4/lib/ldb/man/ldbadd.1.xml index 0b3122ab32..0b3122ab32 100644 --- a/source4/lib/ldb/man/man1/ldbadd.1.xml +++ b/source4/lib/ldb/man/ldbadd.1.xml diff --git a/source4/lib/ldb/man/man1/ldbdel.1.xml b/source4/lib/ldb/man/ldbdel.1.xml index 2f98f9d427..2f98f9d427 100644 --- a/source4/lib/ldb/man/man1/ldbdel.1.xml +++ b/source4/lib/ldb/man/ldbdel.1.xml diff --git a/source4/lib/ldb/man/man1/ldbedit.1.xml b/source4/lib/ldb/man/ldbedit.1.xml index 0b5c63a17a..0b5c63a17a 100644 --- a/source4/lib/ldb/man/man1/ldbedit.1.xml +++ b/source4/lib/ldb/man/ldbedit.1.xml diff --git a/source4/lib/ldb/man/man1/ldbmodify.1.xml b/source4/lib/ldb/man/ldbmodify.1.xml index e39f74fffa..e39f74fffa 100644 --- a/source4/lib/ldb/man/man1/ldbmodify.1.xml +++ b/source4/lib/ldb/man/ldbmodify.1.xml diff --git a/source4/lib/ldb/man/man1/ldbrename.1.xml b/source4/lib/ldb/man/ldbrename.1.xml index 32456243af..32456243af 100644 --- a/source4/lib/ldb/man/man1/ldbrename.1.xml +++ b/source4/lib/ldb/man/ldbrename.1.xml diff --git a/source4/lib/ldb/man/man1/ldbsearch.1.xml b/source4/lib/ldb/man/ldbsearch.1.xml index 8361aa97ff..8361aa97ff 100644 --- a/source4/lib/ldb/man/man1/ldbsearch.1.xml +++ b/source4/lib/ldb/man/ldbsearch.1.xml |