mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
make: Cleanup commit
This commit is contained in:
parent
3b5055f0df
commit
ba0c77c3ac
5 changed files with 63 additions and 23 deletions
|
|
@ -35,7 +35,7 @@ endif
|
|||
$(CC) $< $(LDFLAGS) -o $@
|
||||
|
||||
$(LIB_SO): $(LIB_A)
|
||||
$(CC) -shared -Wl,--whole-archive $< -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $< -Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
|
||||
|
||||
$(TOPDIR)/include:
|
||||
mkdir -p $@
|
||||
|
|
@ -57,25 +57,29 @@ timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
|
|||
|
||||
ifeq ($(USE_PROJECT_LIB),true)
|
||||
ifeq ($(LIBTYPE),shared)
|
||||
$(EXE): $(OBJ) $(LIB_SO)
|
||||
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
|
||||
else
|
||||
$(EXE): $(OBJ) $(LIB_A)
|
||||
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
|
||||
endif
|
||||
else
|
||||
$(EXE): $(OBJ)
|
||||
$(EXE) $(EXE_BIN): $(OBJ)
|
||||
endif
|
||||
$(CC) $(OBJ) $(LDFLAGS) -o $@
|
||||
mkdir -p $(BUILD_BINDIR)
|
||||
install -m 755 $@ $(BUILD_BINDIR)
|
||||
|
||||
$(LIBS):
|
||||
make -C $(LIBDIR) all
|
||||
|
||||
$(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
|
||||
$(INSTALL) -d -g $(EXEGROUP) -o $(EXEOWNER) -m $(EXEMODE) $@
|
||||
$(INSTALL) -d -g $(MAKEGROUP) -o $(MAKEOWNER) -m 755 $@
|
||||
|
||||
$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): libdir.done
|
||||
|
||||
libdir.done:
|
||||
mkdir -p $(INSTALL_LIBDIR)
|
||||
libdir.done: $(INSTALL_LIBDIR)
|
||||
touch $@
|
||||
|
||||
hdrdir.done: $(INSTALL_HDRDIR)
|
||||
touch $@
|
||||
|
||||
$(LINKS_SO):
|
||||
|
|
@ -93,6 +97,8 @@ $(INSTALLED_EXE): $(EXE)
|
|||
endif
|
||||
$(INSTALL_BINDIR)/%.sh: %.sh
|
||||
$(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
$(INSTALL_BINDIR)/%.bin: %.bin
|
||||
$(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
|
||||
$(INSTALL_LIBDIR)/%.so: %.so
|
||||
$(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
|
||||
|
|
@ -111,6 +117,18 @@ $(INSTALL_DOCDIR_DIST)/% $(INSTALL_DOCDIR_DEVEL)/%: %
|
|||
mkdir -p $(dir $@)
|
||||
$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
|
||||
|
||||
$(INSTALLED_PROFILE_PATH_SCRIPT):
|
||||
echo "if [ -z $$PATH ]; then PATH=$(shell echo $(INSTALL_BINDIR) | sed -e s%$(ENV_PREFIX)%%)" > path_script.sh
|
||||
echo "else PATH=$$PATH:$(shell echo $(INSTALL_BINDIR) | sed -e s%$(ENV_PREFIX)%%); fi" >> path_script.sh
|
||||
mkdir -p $(dir $@)
|
||||
$(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) path_script.sh $@
|
||||
|
||||
ifeq ($(DEVELOPMENT),true)
|
||||
install_profile_path:
|
||||
else
|
||||
install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT)
|
||||
endif
|
||||
|
||||
checkroot:
|
||||
@if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \
|
||||
echo "Error: You can only do this if either" ;\
|
||||
|
|
@ -145,6 +163,7 @@ doneclean:
|
|||
execlean: allclean objclean textclean
|
||||
|
||||
distclean: clean objclean textclean tmpclean vcdistclean profclean timerclean
|
||||
rm -rf $(DISTCLEAN)
|
||||
|
||||
localclean: $(LOCAL_CLEAN)
|
||||
rm -rf $(CLEAN)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue