r14097: Remove subsystem names when installing modules (they're already installed

[samba.git] / source4 / main.mk

diff --git a/source4/main.mk b/source4/main.mk
index 6fad1805ea5a931f42a0ed6136ae79d01003222b..28d4748edf7c74126f676ca9a433bab0ebe2abeb 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -1,4 +1,4 @@
-all: basics bin/asn1_compile bin/compile_et binaries
+all: basics bin/asn1_compile bin/compile_et binaries libraries modules
 
 include heimdal_build/config.mk
 include config.mk
@@ -31,8 +31,7 @@ include scripting/config.mk
 include kdc/config.mk
 include passdb/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/nterr.h $(srcdir)/include/nt_status.h \
-                                 $(srcdir)/include/smb.h $(srcdir)/include/core.h
+DEFAULT_HEADERS = $(srcdir)/include/core.h
 
 binaries: $(BINARIES)
 libraries: $(STATIC_LIBS) $(SHARED_LIBS)
@@ -43,19 +42,22 @@ everything: all
 
 showlayout: 
        @echo 'Samba will be installed into:'
-       @echo '  basedir: $(BASEDIR)'
-       @echo '  bindir:  $(BINDIR)'
-       @echo '  sbindir: $(SBINDIR)'
-       @echo '  libdir:  $(LIBDIR)'
+       @echo '  basedir:     $(BASEDIR)'
+       @echo '  bindir:      $(BINDIR)'
+       @echo '  sbindir:     $(SBINDIR)'
+       @echo '  libdir:      $(LIBDIR)'
        @echo '  modulesdir:  $(MODULESDIR)'
        @echo '  includedir:  $(INCLUDEDIR)'
-       @echo '  vardir:  $(VARDIR)'
+       @echo '  vardir:      $(VARDIR)'
        @echo '  privatedir:  $(PRIVATEDIR)'
-       @echo '  piddir:   $(PIDDIR)'
-       @echo '  lockdir:  $(LOCKDIR)'
-       @echo '  logfilebase:  $(LOGFILEBASE)'
-       @echo '  swatdir:  $(SWATDIR)'
-       @echo '  mandir:   $(MANDIR)'
+       @echo '  piddir:      $(PIDDIR)'
+       @echo '  lockdir:     $(LOCKDIR)'
+       @echo '  logfilebase: $(LOGFILEBASE)'
+       @echo '  setupdir:    $(SETUPDIR)'
+       @echo '  jsdir:       $(JSDIR)'
+       @echo '  swatdir:     $(SWATDIR)'
+       @echo '  mandir:      $(MANDIR)'
+       @echo '  winbindd_socket_dir:  $(WINBINDD_SOCKET_DIR)'
 
 showflags:
        @echo 'Samba will be compiled with flags:'
@@ -81,10 +83,11 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
         -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
         -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
         -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-        -DMODULESDIR=\"$(MODULESDIR)\"
+        -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
+        -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
 
 install: showlayout installbin installdat installswat installmisc installlib \
-       installheader installpc
+       installheader installpc installplugins
 
 # DESTDIR is used here to prevent packagers wasting their time
 # duplicating the Makefile. Remove it and you will have the privilege
@@ -107,7 +110,8 @@ installdirs:
                $(DESTDIR)$(LOGFILEBASE) \
                $(DESTDIR)$(PRIVATEDIR)/tls \
                $(DESTDIR)$(INCLUDEDIR) \
-               $(DESTDIR)$(PKGCONFIGDIR)
+               $(DESTDIR)$(PKGCONFIGDIR) \
+               $(DESTDIR)$(CONFIGDIR) \
 
 installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
        @$(SHELL) $(srcdir)/script/installbin.sh \
@@ -142,12 +146,13 @@ installman: installdirs
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)
 
 installmisc: installdirs
-       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR)
+       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(JSDIR) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(BINDIR)
 
 installpc: installdirs
        @$(SHELL) $(srcdir)/script/installpc.sh $(srcdir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
 
-uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader
+uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader \
+       uninstallplugins
 
 uninstallmisc:
        #FIXME
@@ -241,8 +246,10 @@ include/includes.h: \
                librpc/rpc/dcerpc.h \
                auth/credentials/credentials_proto.h \
                libcli/nbt/libnbt.h \
-               lib/basic.h \
-               lib/charset/charset.h
+               lib/util/util_proto.h \
+               lib/charset/charset.h \
+               param/param.h \
+               libcli/util/proto.h
 
 clean_pch: 
        -rm -f include/includes.h.gch
@@ -262,12 +269,17 @@ clean: heimdal_clean clean_pch
        @echo Removing hostcc objects
        @-find . -name '*.ho' -exec rm -f '{}' \;
        @echo Removing binaries
-       @-rm -f $(BIN_PROGS) $(SBIN_PROGS)
+       @-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES)
        @echo Removing libraries
-       @-rm -f bin/*.$(SHLIBEXT).*
+       @-rm -f $(STATIC_LIBRARIES) $(SHARED_LIBRARIES)
+       @-rm -f bin/*.$(SHLIBEXT)*
+       @echo Removing modules
+       @-rm -f $(SHARED_MODULES) $(PLUGINS)
+       @-rm -f bin/*_init_module.c
        @echo Removing dummy targets
        @-rm -f bin/.*_*
        @echo Removing generated files
+       @-rm -f bin/*_init_module.c
        @-rm -rf librpc/gen_* 
        @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
        @echo Removing proto headers
@@ -280,6 +292,7 @@ distclean: clean
        -rm -f config.log config.cache
        -rm -f samba4-deps.dot
        -rm -f config.pm config.mk
+       -rm -f $(PC_FILES)
 
 removebackup:
        -rm -f *.bak *~ */*.bak */*~ */*/*.bak */*/*~ */*/*/*.bak */*/*/*~
@@ -342,3 +355,6 @@ DOCBOOK_MANPAGE_URL = http://docbook.sourceforge.net/release/xsl/current/manpage
 
 .7.xml.7:
        $(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
+
+.8.xml.8:
+       $(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<