mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
rules.mk: Code beautification
- Remove unused code - Beautify installation logging
This commit is contained in:
Jan Lindemann
parent
61d0c9a226
commit
5686370c58
1 changed files with 2 additions and 131 deletions
133
make/rules.mk
133
make/rules.mk
|
|
@ -87,10 +87,6 @@ timerclean:
|
|||
varclean:
|
||||
rm -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES)
|
||||
|
||||
install_libdir: $(INSTALL_LIBDIR)
|
||||
install_bindir: $(INSTALL_EXEDIR)
|
||||
install_hdrdir: $(INSTALL_HDRDIR)
|
||||
|
||||
love:
|
||||
@echo "Not war?"
|
||||
|
||||
|
|
@ -151,37 +147,6 @@ strip.done: $(EXE_ALL)
|
|||
%.done:
|
||||
make -$(MAKEFLAGS) -C $(shell dirname $@) `basename $@`
|
||||
|
||||
#lib$(MOD)(%.o).a: %.c $(BUILD_LIBDIR)
|
||||
# $(CC) $(CFLAGS) -c $< -o $*.o
|
||||
# $(AR) r $@ $*.o
|
||||
# $(RM) $*.o
|
||||
|
||||
ifeq ($(QT_MAJOR_VERSION),3)
|
||||
moc_%.cpp: %.h
|
||||
$(MOC) -o $@ $<
|
||||
else
|
||||
moc_%.cpp: %.h
|
||||
$(MOC) $(filter -D% -I%,$(strip $(CPPFLAGS))) -o $@ $<
|
||||
endif
|
||||
|
||||
rcc_%.cpp: %.qrc
|
||||
$(RCC) -o $@ $<
|
||||
|
||||
ifeq ($(QT_MAJOR_VERSION),4)
|
||||
ui_%.h: %.ui
|
||||
else
|
||||
%.h: %.ui
|
||||
endif
|
||||
$(UIC) $< -o $@
|
||||
|
||||
ifeq ($(QT_MAJOR_VERSION),4)
|
||||
uic_%.cpp: %.h
|
||||
echo -e "#include <$<>\n" > $@
|
||||
else
|
||||
uic_%.cpp: %.h %.ui
|
||||
$(UIC) $*.ui -i $< -o $@
|
||||
endif
|
||||
|
||||
ifeq ($(LIBTYPE),shared)
|
||||
lib%.so: %.o # $(LIB_SO)
|
||||
$(LD) -shared $(LDFLAGS) $^ -o $@
|
||||
|
|
@ -206,15 +171,6 @@ $(MSVCPP_IMPLIB): $(LIB_SO)
|
|||
$(MS_LD) /machine:i386 /def:$(LIB_DEF)
|
||||
endif
|
||||
|
||||
#$(TOPDIR)/include:
|
||||
# mkdir -p $@
|
||||
#
|
||||
#$(TOPDIR)/include/%.h: %.h
|
||||
# mkdir -p $(dir $@); cp $< $@
|
||||
#
|
||||
#$(TOPDIR)/bin/%.sh: %.sh
|
||||
# mkdir -p $(dir $@); install -m 755 $(@F) $@
|
||||
|
||||
%.o: %.cpp
|
||||
$(CPP) $(CPPFLAGS) -c $<
|
||||
|
||||
|
|
@ -242,10 +198,6 @@ else
|
|||
endif
|
||||
$(CPP) $(sort $(OBJ)) $(LDFLAGS) -o $@
|
||||
|
||||
#$(BUILD_EXEDIR)/%: %
|
||||
# mkdir -p $(BUILD_EXEDIR)
|
||||
# install -m 755 $< $(BUILD_EXEDIR)
|
||||
|
||||
ifeq ($(USE_PROJECT_LIB),true)
|
||||
ifeq ($(LIBTYPE),shared)
|
||||
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LIB_SO)
|
||||
|
|
@ -259,32 +211,6 @@ endif
|
|||
mkdir -p $(BUILD_LIBDIR)
|
||||
install -m 755 $@ $(BUILD_LIBDIR)
|
||||
|
||||
#$(LIBS):
|
||||
# make -$(MAKEFLAGS) -C $(BUILD_LIBDIR) all
|
||||
#
|
||||
#$(INSTALL_LIBDIR):
|
||||
# $(INSTALL) -d -g $(LIBGROUP) -o $(LIBOWNER) -m 755 $@
|
||||
#
|
||||
#$(INSTALL_HDRDIR):
|
||||
# $(INSTALL) -d -g $(HDRGROUP) -o $(HDROWNER) -m 755 $@
|
||||
#
|
||||
#$(INSTALL_EXEDIR):
|
||||
# $(INSTALL) -d -g $(EXEGROUP) -o $(EXEOWNER) -m 755 $@
|
||||
#
|
||||
#$(INSTALL_MKDIR):
|
||||
# $(INSTALL) -d -g $(MAKEGROUP) -o $(MAKEOWNER) -m 755 $@
|
||||
#
|
||||
#$(WORKING_DIR):
|
||||
# $(INSTALL) -d -g $(DAEMON_RUN_GROUP) -o $(DAEMON_RUN_USER) -m 700 $@
|
||||
#
|
||||
#$(PREFIX):
|
||||
# $(INSTALL) -d -g $(PREFIXDIRGROUP) -o $(PREFIXDIROWNER) -m $(PREFIXDIRMODE) $@
|
||||
|
||||
#$(LOCK_DIR):
|
||||
# $(INSTALL) -d -g $(DAEMON_RUN_GROUP) -o $(DAEMON_RUN_USER) -m 700 $@
|
||||
|
||||
#$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(TOPDIR)/libdir.done
|
||||
|
||||
define check_not_empty
|
||||
check_not_empty_$(1):
|
||||
@if [ -z "$($(1))" ]; then \
|
||||
|
|
@ -309,14 +235,14 @@ $(TOPDIR)/dir_build_$(1).done:
|
|||
#$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done check_not_empty_$(1)MODE
|
||||
$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done
|
||||
@if [ ! $$< -ef $$@ ]; then \
|
||||
echo "+ installing $$< -> $$@" ;\
|
||||
echo install -m $($(1)MODE) $$< $$@ ;\
|
||||
install -m $($(1)MODE) $$< $$@ ;\
|
||||
fi
|
||||
|
||||
$(TOPDIR)/dir_install_$(1).done:
|
||||
@if [ -n "$$(INSTALL_$(1)DIR)" ]; then \
|
||||
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) ;\
|
||||
echo + creating directory $$(INSTALL_$(1)DIR) ;\
|
||||
echo $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) ;\
|
||||
fi
|
||||
touch $$@
|
||||
|
||||
|
|
@ -327,64 +253,9 @@ endef
|
|||
|
||||
$(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(type))))
|
||||
|
||||
#$(TOPDIR)/libdir.done:
|
||||
# if [ -n "$(INSTALL_LIBDIR)" ]; then \
|
||||
# $(INSTALL) -d -o $(EXEDIROWNER) -g $(EXEDIRGROUP) -m $(EXEDIRMODE) $(INSTALL_LIBDIR) ;\
|
||||
# fi
|
||||
# touch $@
|
||||
|
||||
#$(TOPDIR)/hdrdir.done:
|
||||
# if [ -n "$(INSTALL_HDRDIR)" ]; then \
|
||||
# $(INSTALL) -d -o $(HDRDIROWNER) -g $(HDRDIRGROUP) -m $(HDRDIRMODE) $(INSTALL_HDRDIR) ;\
|
||||
# fi
|
||||
# touch $@
|
||||
#
|
||||
#$(TOPDIR)/bindir.done:
|
||||
# mkdir -p $(INSTALL_EXEDIR)
|
||||
# touch $@
|
||||
#
|
||||
#$(TOPDIR)/profiledir.done:
|
||||
# if [ -n "$(PROFILE_DIR)" ]; then \
|
||||
# $(INSTALL) -d -o $(PROFILEDIROWNER) -g $(PROFILEDIRGROUP) -m $(PROFILEDIRMODE) $(PROFILE_DIR) ;\
|
||||
# fi
|
||||
# touch $@
|
||||
|
||||
$(LINKS_SO):
|
||||
cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)
|
||||
|
||||
#$(INSTALLED_LINKS_SO) $(LINKS_SO):
|
||||
# $(LINK_LIB) $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $@
|
||||
|
||||
#$(INSTALL_EXEDIR)/%.bin: %.bin
|
||||
# $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
|
||||
#$(INSTALLED_EXE): $(EXE) $(TOPDIR)/bindir.done
|
||||
# $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
#$(INSTALL_EXEDIR)/%.sh: %.sh $(TOPDIR)/bindir.done
|
||||
# $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
#$(INSTALL_EXEDIR)/%.bin: %.bin $(TOPDIR)/bindir.done
|
||||
# $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
#$(INSTALL_EXEDIR)/%: % $(TOPDIR)/bindir.done
|
||||
# $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
|
||||
|
||||
#$(INSTALL_LIBDIR)/%.so: %.so
|
||||
# $(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
|
||||
#$(INSTALL_LIBDIR)/%.$(SO_SUFFIX): %.$(SO_SUFFIX)
|
||||
# $(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
|
||||
#$(INSTALL_LIBDIR)/%.a: %.a
|
||||
# $(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
|
||||
|
||||
#$(INSTALL_HDRDIR)/%.h: %.h
|
||||
# $(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
|
||||
#
|
||||
#$(INSTALL_MKDIR)/%.mk: %.mk
|
||||
# $(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
|
||||
|
||||
# TODO: make this depend on $(TOPDIR)/docdir.done
|
||||
#$(INSTALL_DOCDIR_DIST)/% $(INSTALL_DOCDIR_DEVEL)/%: %
|
||||
# mkdir -p $(dir $@)
|
||||
# $(INSTALL) -o $(DOCOWNER) -g $(DOCGROUP) -m $(DOCMODE) $< $@
|
||||
|
||||
$(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
|
||||
echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh
|
||||
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue