makefile: minor fixes

- main.d and core_cmd.d  generation failed on clean sources,
  because of missing autover.h
- make tar excludes now .git*, *.swo and includes autover.h

diff --git a/Makefile b/Makefile
index 42daf72..307096b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,8 @@ endif
 
 
 auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc
 
 
 auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc

-auto_gen_others=cfg.tab.h autover.h  # auto generated, non-c
+auto_gen_others=cfg.tab.h # auto generated, non-c
+auto_gen_keep=autover.h # auto generated, should be included in archives

 
 COREPATH=.
 #include  source related defs
 
 COREPATH=.
 #include  source related defs


@@ -397,11 +398,12 @@ modules_search_path=$(subst $(space),:,$(strip\
                #                               $(addprefix $(modules_target),$(modules_dirs))))
 
 # special depends for main.o
                #                               $(addprefix $(modules_target),$(modules_dirs))))
 
 # special depends for main.o

-main.o: autover.h
+main.d main.o: autover.h

 main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"'
 
 main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"'
 

+

 #special depends for core_cmd.o
 #special depends for core_cmd.o

-core_cmd.o: autover.h
+core_cmd.d core_cmd.o: autover.h

 
 include Makefile.shared
 
 
 include Makefile.shared
 


@@ -657,13 +659,14 @@ dbg: sip-router
 
 dist: tar
 
 
 dist: tar
 

-tar: autover.h
+tar: $(auto_gen_keep)

        $(TAR) -C .. \
                --exclude=$(notdir $(CURDIR))/test* \
                --exclude=$(notdir $(CURDIR))/tmp* \
                --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME) \
                --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME)-* \
                --exclude=$(notdir $(CURDIR))/$(MAIN_NAME)_tls* \
        $(TAR) -C .. \
                --exclude=$(notdir $(CURDIR))/test* \
                --exclude=$(notdir $(CURDIR))/tmp* \
                --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME) \
                --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME)-* \
                --exclude=$(notdir $(CURDIR))/$(MAIN_NAME)_tls* \

+               --exclude=.git* \

                --exclude=CVS* \
                --exclude=.svn* \
                --exclude=.cvsignore \
                --exclude=CVS* \
                --exclude=.svn* \
                --exclude=.cvsignore \


@@ -682,6 +685,7 @@ tar: autover.h
                --exclude=*.patch \
                --exclude=.\#* \
                --exclude=*.swp \
                --exclude=*.patch \
                --exclude=.\#* \
                --exclude=*.swp \

+               --exclude=*.swo \

                ${tar_extra_args} \
                -cf - $(notdir $(CURDIR)) | \
                        (mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \
                ${tar_extra_args} \
                -cf - $(notdir $(CURDIR)) | \
                        (mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \

diff --git a/Makefile.rules b/Makefile.rules
index f377e23..99042c3 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -7,9 +7,9 @@
 
 #
 # Uses: NAME, ALLDEP, CC, CFLAGS, C_DEFS, DEFS, C_INCLUDES, INCLUDES, LIBS, 
 
 #
 # Uses: NAME, ALLDEP, CC, CFLAGS, C_DEFS, DEFS, C_INCLUDES, INCLUDES, LIBS, 

-#       MKDEP, auto_gen, 
-# auto_gen_others, depends, objs, extra_objs, static_modules, 
-# static_modules_path, LD_RPATH
+#       MKDEP, auto_gen, auto_gen_others, auto_gen_keep, 
+#       depends, objs, extra_objs, static_modules, static_modules_path,
+#       LD_RPATH

 # (all this must  be defined previously!,  see Makefile.defs & Makefile)
 # Optional: SER_LIBS - list of ser libraries that will be automatically
 #  built if necessary. Format: path/shortname, where shortname is the 
 # (all this must  be defined previously!,  see Makefile.defs & Makefile)
 # Optional: SER_LIBS - list of ser libraries that will be automatically
 #  built if necessary. Format: path/shortname, where shortname is the 


@@ -205,7 +205,7 @@ clean-utils:
 .PHONY: realclean
 .PHONY: maintainer-clean
 proper distclean realclean maintainer-clean: local-clean
 .PHONY: realclean
 .PHONY: maintainer-clean
 proper distclean realclean maintainer-clean: local-clean

-       -@rm -f $(depends) $(auto_gen) $(auto_gen_others) \
+       -@rm -f $(depends) $(auto_gen) $(auto_gen_others) $(auto_gen_keep) \

                        makecfg.lst 2>/dev/null
 
 maintainer-clean: clean-tmp
                        makecfg.lst 2>/dev/null
 
 maintainer-clean: clean-tmp