janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

$(TOPDIR), make: Merged changes of V_1_1_7_1_JL

Browse source
This commit is contained in:
Jan Lindemann 2004-04-20 16:48:50 +00:00 • committed by Jan Lindemann
commit 7067725092
6 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
make/rules.mk
View file

@ -56,13 +56,13 @@ timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
sh $(GENERATE_FUNC_TIMERS) $< $@
ifeq ($(USE_PROJECT_LIB),true)
ifeq ($(LIBTYPE),shared)
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
ifeq ($(LIBTYPE),shared)
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
else
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
endif
else
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
endif
else
$(EXE) $(EXE_BIN): $(OBJ)
$(EXE) $(EXE_BIN): $(OBJ)
endif
$(CC) $(OBJ) $(LDFLAGS) -o $@
mkdir -p $(BUILD_BINDIR)
@ -119,7 +119,7 @@ $(INSTALL_MKDIR)/%.mk: %.mk
$(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
@ -136,6 +136,9 @@ else
install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT)
endif
depend:
makedepend -- $(CPPFLAGS) $(DEPEND_CPPFLAGS) -- $(wildcard *.cpp *.h)
checkroot:
@if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \
echo "Error: You can only do this if either" ;\