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 ecc614ca7bf1ce52f24cd8eb016cddf35d6296c3..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,7 +31,7 @@ include scripting/config.mk
 include kdc/config.mk
 include passdb/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/smb.h $(srcdir)/include/core.h
+DEFAULT_HEADERS = $(srcdir)/include/core.h
 
 binaries: $(BINARIES)
 libraries: $(STATIC_LIBS) $(SHARED_LIBS)
@@ -87,7 +87,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
         -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
@@ -151,7 +151,8 @@ installmisc: installdirs
 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
@@ -248,6 +249,7 @@ include/includes.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
@@ -267,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
@@ -285,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 */*/*/*~