diff --git a/make/lo.mk b/make/lo.mk index 90654e73..0bd0f79b 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -8,14 +8,14 @@ LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK include $(MODDIR)/make/defs.mk -.PRECIOUS: %.cpp +.PRECIOUS: %.cpp %.o LOADABLE_OBJS_BASE = $(patsubst %$(CPP_SUFFIX),%,$(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h))))) LOADABLE_OBJS = $(filter-out $(LOADABLE_OBJ_IGNORE),$(LOADABLE_OBJS_BASE)) -LOCAL_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) +LOADABLE_OBJ_CPP = $(patsubst %,%.cpp,$(LOADABLE_OBJS)) LOADABLE_OBJS_O = $(patsubst %,%.o,$(LOADABLE_OBJS)) OTHER_CPP_IGNORE = $(patsubst %,$(CPP_PREFIX)%.cpp,$(LOADABLE_OBJ_IGNORE)) -OTHER_CPP = $(filter-out $(LOCAL_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) +OTHER_CPP = $(filter-out $(LOADABLE_OBJ_CPP) $(OTHER_CPP_IGNORE),$(wildcard *.cpp)) ifneq ($(OTHER_CPP),) OTHER_O = $(patsubst %.cpp,%.o,$(OTHER_CPP)) OTHER_LIB = liblocal.a @@ -41,8 +41,8 @@ clean.generated: clean.lo: profclean clean.generated rm -f $(wildcard *.o *.so *.done *.dll $(OTHER_LIB)) -$(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(OTHER_LIB) - $(CPP) $< -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ +$(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(CPP_PREFIX)%.o $(OTHER_LIB) + $(CPP) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ %.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%$(CPP_SUFFIX).h echo "#include \"$<\"" > $@.tmp @@ -63,3 +63,4 @@ $(BUILD_LIBDIR)/%.dll: %.dll include $(MODDIR)/make/rules.mk include $(MODDIR)/make/depend.mk + diff --git a/make/topdir.mk b/make/topdir.mk index a251e121..a535593d 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -6,6 +6,8 @@ config: SUBDIRS ?= $(wildcard inst/pre make scripts contrib tools src include lib bin \ util plugins conf config cfg images doc test inst/post) +PROJECT_DESCR = $(TOPDIR)/doc/share/project.txt + ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) include $(TOPDIR)/make/defs.mk endif @@ -89,6 +91,10 @@ git-init: exit 1 ;\ fi git init + if [ -e $(PROJECT_DESCR) ]; then \ + touch $(PROJECT_DESCR) ;\ + make description ;\ + fi git-init-from-cvs: git-init list-cvs-files.sh -f | xargs git add @@ -119,3 +125,9 @@ git-jannet-init: git-import git-clone-to-remote projects-%: python $(MOD_SCRIPT_DIR)/build.py $* $(PROJECT) +$(TOPDIR)/.git/description: $(PROJECT_DESCR) + $(MOD_SCRIPT_DIR)/ini-section.sh summary $< | tee $@.tmp + mv $@.tmp $@ + +description: $(TOPDIR)/.git/description +