janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

defs.mk: Code beautification

Browse source 
- Renamed some LOCAL_ variables to BUILD_
  - Improved indentation (not optimal yet)
This commit is contained in:
Jan Lindemann 2005-12-01 08:54:17 +00:00 • committed by Jan Lindemann
commit 643b632754
1 changed files with 168 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

39
make/defs.mk
View file

@ -45,31 +45,32 @@ YTOOLS_VERSION_STR = \"@PACKAGE_VERSION@\"
CPP = g++
EXE_SH += $(wildcard *.sh)
EXE_SH += $(wildcard *.sh *.pl)
MKFILES += $(wildcard *.mk)
LOCAL_H += $(wildcard *.h)
LOCAL_C += $(wildcard *.c)
LOCAL_CPP += $(wildcard *.c *.cpp *.cc *.C)
LOCAL_CSRC += $(LOCAL_H) $(LOCAL_C) $(LOCAL_CPP)
FULL_NAME = $(shell grep "^`id -nu`": /etc/passwd | cut -d: -f5)
SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*)))
SRC_FILES += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX)))
SRC_HEADERED+= $(shell if [ "$(SRC_FILES)" ]; then grep -ic "it services" $(SRC_FILES) | sed '/:0$$/ d; s/:.*$$//'; fi)
SRC_UNHEADERED+= $(filter-out $(SRC_HEADERED),$(SRC_FILES))
CFILES += $(wildcard *.c)
CPPFILES += $(wildcard *.cc *.cpp)
LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX)))
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | sed '/:0$$/ d; s/:.*$$//'; fi)
SRC_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC))
LOCAL_C += $(wildcard *.c)
LOCAL_CPP += $(wildcard *.cc *.cpp *.C)
LOCAL_H += $(wildcard *.h *.H)
SFILES += $(wildcard *.S)
UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc)
CALLSRC += $(CFILES) $(CPPFILES)
OBJ += $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC))))
SRC_ALL_CPP += $(LOCAL_C) $(LOCAL_CPP) $(LOCAL_H)
SRC_H += $(filter %.h %.H, $(SRC_ALL_CPP))
SRC_C += $(filter %.c, $(SRC_ALL_CPP))
SRC_CPP += $(filter %.cc %.cpp %.C, $(SRC_ALL_CPP))
OBJ += $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(filter %.c %.cpp %.cc, $(SRC_ALL_CPP)))))
OBJ += $(patsubst %.S,%.o,$(SFILES))
SHOBJS += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
SHOBJS += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(SRC_ALL_CPP))))
SHSCRIPTS += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
SCRIPTS += $(patsubst %.tmpl,%,$(wildcard *.tmpl))
LOCAL_HDR += $(patsubst %.h,$(TOPDIR)/include/%.h,$(LOCAL_H))
LOCAL_EXE_SH+= $(patsubst %.sh,$(BUILD_BINDIR)/%.sh,$(EXE_SH))
BUILD_EXE_SH += $(patsubst %.sh,$(BUILD_BINDIR)/%.sh,$(EXE_SH))
BUILD_H += $(patsubst %.h,$(TOPDIR)/include/%.h,$(SRC_H))
PREREQ_DIR += $(addprefix $(MODDIR)/,$(LOCAL_PREREQ))
PREREQ_DONE += $(addsuffix /all.done,$(PREREQ_DIR))
@ -83,12 +84,12 @@ CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS))
REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED))
REQUIRED_DONE+= $(patsubst %,%/all.done,$(REQUIRED_DIR))
REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR))
REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h))
REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c))
REQUIRED_CPP += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \
$(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp))
REQUIRED_CSRC+= $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP)
REQUIRED_CSRC += $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP)
ALL_H += $(LOCAL_H) $(PREREQ_H)
ALL_C += $(LOCAL_C) $(PREREQ_CPP)
@ -146,7 +147,7 @@ INSTALLED_EXE += $(INSTALL_BINDIR)/$(EXE)
INSTALLED_EXE_SH += $(addprefix $(INSTALL_BINDIR)/,$(EXE_SH))
INSTALLED_EXE_BIN += $(addprefix $(INSTALL_BINDIR)/,$(EXE_BIN))
INSTALLED_MKFILES += $(addprefix $(INSTALL_MKDIR)/,$(MKFILES))
INSTALLED_H += $(addprefix $(INSTALL_HDRDIR)/,$(LOCAL_H))
INSTALLED_H += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H))
INSTALLED_PROFILE_PATH_SCRIPT = $(ENV_PREFIX)/etc/profile.d/path_$(PROJECT).sh
@ -261,7 +262,7 @@ endif
ifeq ($(USE_VALGRIND),true)
PROJECT_CFLAGS += -include /usr/include/valgrind/memcheck.h
PROJECT_CPPFLAGS += -include /usr/include/valgrind/memcheck.h
PROJECT_CPPFLAG += -include /usr/include/valgrind/memcheck.h
# PROJECT_LDFLAGS +=
endif