Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
makefiles
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs
ds
makefiles
Commits
ae2db69b
Commit
ae2db69b
authored
1 year ago
by
Alessio Igor Bogani
Browse files
Options
Downloads
Patches
Plain Diff
Simplify makefiles avoid new features
parent
be548ef4
No related branches found
Branches containing commit
Tags
1.3.2
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Make-9.3.3.in
+41
-26
41 additions, 26 deletions
Make-9.3.3.in
Make-9.3.4.in
+41
-26
41 additions, 26 deletions
Make-9.3.4.in
Make-9.3.5.in
+41
-26
41 additions, 26 deletions
Make-9.3.5.in
Make-9.3.6.in
+41
-26
41 additions, 26 deletions
Make-9.3.6.in
with
164 additions
and
104 deletions
Make-9.3.3.in
+
41
−
26
View file @
ae2db69b
...
...
@@ -28,24 +28,26 @@ ifeq ($(origin SDKTARGETSYSROOT),undefined)
else
CXXFLAGS += -std=gnu++14
endif
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} -I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} -L${RUNTIME_LIB} -L/usr/local/lib
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} \
-I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} \
-L${RUNTIME_LIB} -L/usr/local/lib
else
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) $(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
CXXFLAGS += -std=gnu++14
INC_DIR = -I${SDKTARGETSYSROOT}/usr/include/tango
endif
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) \
$(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
#-----------------------------------------
# Default make entry
#-----------------------------------------
default: release
release debug: bin/$(NAME_SRV)
all: default
release: bin/$(NAME_SRV)
debug: bin/$(NAME_SRV)
#-----------------------------------------
# Set CXXFLAGS and LDFLAGS
...
...
@@ -55,34 +57,56 @@ CXXFLAGS += -D__linux__ -D__OSVERSION__=2 -Wall -pedantic \
$(INC_DIR) -Isrc
ifeq ($(GCCMAJOR),4)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
ifeq ($(GCCMAJOR),5)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
LDFLAGS += $(LIB_DIR) -ltango -lomniORB4 -lomniDynamic4 \
-lCOS4 -lomnithread -lzmq
ifeq ($(origin MAKECMDGOALS),undefined)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),release)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),debug)
CXXFLAGS += -ggdb3
endif
#-----------------------------------------
# Set dependencies
#-----------------------------------------
SRC_FILES += $(wildcard src/*.cpp)
OBJ_FILES += $(addprefix obj/$(HASHDIR),$(notdir $(SRC_FILES:.cpp=.o)))
MK_FILES = $(filter-out .nse_depinfo$(POINTHASH), $(MAKEFILE_LIST))
obj/$(HASHDIR)%.o: $(MK_FILES)
$(CXX) $(CXXFLAGS) -c -o $@ $(filter %$(*F).cpp, $(SRC_FILES))
obj/$(HASHDIR)%.o: $(SRC_FILES:%.cpp)
$(CXX) $(CXXFLAGS) -c -o $@ $<
.nse_depinfo:
@touch $@
.nse_depinfo$(POINTHASH): $(SRC_FILES) .nse_depinfo
@$(CXX) $(CXXFLAGS) -M $^ 2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' | tee .nse_depinfo > .nse_depinfo$(POINTHASH)
ifneq ($(MAKECMDGOALS),clean)
@$(CXX) $(CXXFLAGS) -M $^ \
2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' \
| tee .nse_depinfo > .nse_depinfo$(POINTHASH)
endif
-include .nse_depinfo$(POINTHASH)
#-----------------------------------------
# Main make entries
#-----------------------------------------
obj/$(HASHDIR)$(NAME_SRV):
bin
obj/$(HASH) $(OBJ_FILES)
obj/$(HASHDIR)$(NAME_SRV): obj/$(HASH) $(OBJ_FILES)
$(CXX) $(CXXFLAGS) $(OBJ_FILES) -o $@ $(LDFLAGS)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV) .nse_depinfo
$(POINTHASH)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV)
bin
.nse_depinfo
@cp $< $@
clean:
...
...
@@ -91,13 +115,4 @@ clean:
bin obj/$(HASH):
@test -d $@ || mkdir -p $@
#-----------------------------------------
# Target specific options
#-----------------------------------------
release: CXXFLAGS += -O2 -DNDEBUG
release: LDFLAGS += -s
debug: CXXFLAGS += -ggdb3
.EXTRA_PREREQS+=$(foreach mk, ${MAKEFILE_LIST},$(abspath ${mk}))
.PHONY: clean
This diff is collapsed.
Click to expand it.
Make-9.3.4.in
+
41
−
26
View file @
ae2db69b
...
...
@@ -28,24 +28,26 @@ ifeq ($(origin SDKTARGETSYSROOT),undefined)
else
CXXFLAGS += -std=gnu++14
endif
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} -I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} -L${RUNTIME_LIB} -L/usr/local/lib
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} \
-I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} \
-L${RUNTIME_LIB} -L/usr/local/lib
else
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) $(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
CXXFLAGS += -std=gnu++14
INC_DIR = -I${SDKTARGETSYSROOT}/usr/include/tango
endif
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) \
$(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
#-----------------------------------------
# Default make entry
#-----------------------------------------
default: release
release debug: bin/$(NAME_SRV)
all: default
release: bin/$(NAME_SRV)
debug: bin/$(NAME_SRV)
#-----------------------------------------
# Set CXXFLAGS and LDFLAGS
...
...
@@ -55,34 +57,56 @@ CXXFLAGS += -D__linux__ -D__OSVERSION__=2 -Wall -pedantic \
$(INC_DIR) -Isrc
ifeq ($(GCCMAJOR),4)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
ifeq ($(GCCMAJOR),5)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
LDFLAGS += $(LIB_DIR) -ltango -lomniORB4 -lomniDynamic4 \
-lCOS4 -lomnithread -lzmq
ifeq ($(origin MAKECMDGOALS),undefined)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),release)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),debug)
CXXFLAGS += -ggdb3
endif
#-----------------------------------------
# Set dependencies
#-----------------------------------------
SRC_FILES += $(wildcard src/*.cpp)
OBJ_FILES += $(addprefix obj/$(HASHDIR),$(notdir $(SRC_FILES:.cpp=.o)))
MK_FILES = $(filter-out .nse_depinfo$(POINTHASH), $(MAKEFILE_LIST))
obj/$(HASHDIR)%.o: $(MK_FILES)
$(CXX) $(CXXFLAGS) -c -o $@ $(filter %$(*F).cpp, $(SRC_FILES))
obj/$(HASHDIR)%.o: $(SRC_FILES:%.cpp)
$(CXX) $(CXXFLAGS) -c -o $@ $<
.nse_depinfo:
@touch $@
.nse_depinfo$(POINTHASH): $(SRC_FILES) .nse_depinfo
@$(CXX) $(CXXFLAGS) -M $^ 2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' | tee .nse_depinfo > .nse_depinfo$(POINTHASH)
ifneq ($(MAKECMDGOALS),clean)
@$(CXX) $(CXXFLAGS) -M $^ \
2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' \
| tee .nse_depinfo > .nse_depinfo$(POINTHASH)
endif
-include .nse_depinfo$(POINTHASH)
#-----------------------------------------
# Main make entries
#-----------------------------------------
obj/$(HASHDIR)$(NAME_SRV):
bin
obj/$(HASH) $(OBJ_FILES)
obj/$(HASHDIR)$(NAME_SRV): obj/$(HASH) $(OBJ_FILES)
$(CXX) $(CXXFLAGS) $(OBJ_FILES) -o $@ $(LDFLAGS)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV) .nse_depinfo
$(POINTHASH)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV)
bin
.nse_depinfo
@cp $< $@
clean:
...
...
@@ -91,13 +115,4 @@ clean:
bin obj/$(HASH):
@test -d $@ || mkdir -p $@
#-----------------------------------------
# Target specific options
#-----------------------------------------
release: CXXFLAGS += -O2 -DNDEBUG
release: LDFLAGS += -s
debug: CXXFLAGS += -ggdb3
.EXTRA_PREREQS+=$(foreach mk, ${MAKEFILE_LIST},$(abspath ${mk}))
.PHONY: clean
This diff is collapsed.
Click to expand it.
Make-9.3.5.in
+
41
−
26
View file @
ae2db69b
...
...
@@ -28,24 +28,26 @@ ifeq ($(origin SDKTARGETSYSROOT),undefined)
else
CXXFLAGS += -std=gnu++14
endif
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} -I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} -L${RUNTIME_LIB} -L/usr/local/lib
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} \
-I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} \
-L${RUNTIME_LIB} -L/usr/local/lib
else
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) $(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
CXXFLAGS += -std=gnu++14
INC_DIR = -I${SDKTARGETSYSROOT}/usr/include/tango
endif
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) \
$(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
#-----------------------------------------
# Default make entry
#-----------------------------------------
default: release
release debug: bin/$(NAME_SRV)
all: default
release: bin/$(NAME_SRV)
debug: bin/$(NAME_SRV)
#-----------------------------------------
# Set CXXFLAGS and LDFLAGS
...
...
@@ -55,34 +57,56 @@ CXXFLAGS += -D__linux__ -D__OSVERSION__=2 -Wall -pedantic \
$(INC_DIR) -Isrc
ifeq ($(GCCMAJOR),4)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
ifeq ($(GCCMAJOR),5)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
LDFLAGS += $(LIB_DIR) -ltango -lomniORB4 -lomniDynamic4 \
-lCOS4 -lomnithread -lzmq
ifeq ($(origin MAKECMDGOALS),undefined)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),release)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),debug)
CXXFLAGS += -ggdb3
endif
#-----------------------------------------
# Set dependencies
#-----------------------------------------
SRC_FILES += $(wildcard src/*.cpp)
OBJ_FILES += $(addprefix obj/$(HASHDIR),$(notdir $(SRC_FILES:.cpp=.o)))
MK_FILES = $(filter-out .nse_depinfo$(POINTHASH), $(MAKEFILE_LIST))
obj/$(HASHDIR)%.o: $(MK_FILES)
$(CXX) $(CXXFLAGS) -c -o $@ $(filter %$(*F).cpp, $(SRC_FILES))
obj/$(HASHDIR)%.o: $(SRC_FILES:%.cpp)
$(CXX) $(CXXFLAGS) -c -o $@ $<
.nse_depinfo:
@touch $@
.nse_depinfo$(POINTHASH): $(SRC_FILES) .nse_depinfo
@$(CXX) $(CXXFLAGS) -M $^ 2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' | tee .nse_depinfo > .nse_depinfo$(POINTHASH)
ifneq ($(MAKECMDGOALS),clean)
@$(CXX) $(CXXFLAGS) -M $^ \
2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' \
| tee .nse_depinfo > .nse_depinfo$(POINTHASH)
endif
-include .nse_depinfo$(POINTHASH)
#-----------------------------------------
# Main make entries
#-----------------------------------------
obj/$(HASHDIR)$(NAME_SRV):
bin
obj/$(HASH) $(OBJ_FILES)
obj/$(HASHDIR)$(NAME_SRV): obj/$(HASH) $(OBJ_FILES)
$(CXX) $(CXXFLAGS) $(OBJ_FILES) -o $@ $(LDFLAGS)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV) .nse_depinfo
$(POINTHASH)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV)
bin
.nse_depinfo
@cp $< $@
clean:
...
...
@@ -91,13 +115,4 @@ clean:
bin obj/$(HASH):
@test -d $@ || mkdir -p $@
#-----------------------------------------
# Target specific options
#-----------------------------------------
release: CXXFLAGS += -O2 -DNDEBUG
release: LDFLAGS += -s
debug: CXXFLAGS += -ggdb3
.EXTRA_PREREQS+=$(foreach mk, ${MAKEFILE_LIST},$(abspath ${mk}))
.PHONY: clean
This diff is collapsed.
Click to expand it.
Make-9.3.6.in
+
41
−
26
View file @
ae2db69b
...
...
@@ -28,24 +28,26 @@ ifeq ($(origin SDKTARGETSYSROOT),undefined)
else
CXXFLAGS += -std=gnu++14
endif
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} -I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} -L${RUNTIME_LIB} -L/usr/local/lib
INC_DIR = -I${TANGO_INC} -I${LOG4TANGO_INC} -I${OMNIORB_INC} \
-I${ZMQ_INC} -I${RUNTIME_INC}
LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${ZMQ_LIB} \
-L${RUNTIME_LIB} -L/usr/local/lib
else
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) $(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
CXXFLAGS += -std=gnu++14
INC_DIR = -I${SDKTARGETSYSROOT}/usr/include/tango
endif
HASH = $(shell echo $(SDKTARGETSYSROOT) $(OECORE_DISTRO_VERSION) \
$(CXX) | md5sum | cut -d ' ' -f 1)
HASHDIR = $(HASH)/
HASHEDIR = $(HASH)\/
POINTHASH = .$(HASH)
#-----------------------------------------
# Default make entry
#-----------------------------------------
default: release
release debug: bin/$(NAME_SRV)
all: default
release: bin/$(NAME_SRV)
debug: bin/$(NAME_SRV)
#-----------------------------------------
# Set CXXFLAGS and LDFLAGS
...
...
@@ -55,34 +57,56 @@ CXXFLAGS += -D__linux__ -D__OSVERSION__=2 -Wall -pedantic \
$(INC_DIR) -Isrc
ifeq ($(GCCMAJOR),4)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
ifeq ($(GCCMAJOR),5)
CXXFLAGS += -Wextra
CXXFLAGS += -Wextra
endif
LDFLAGS += $(LIB_DIR) -ltango -lomniORB4 -lomniDynamic4 \
-lCOS4 -lomnithread -lzmq
ifeq ($(origin MAKECMDGOALS),undefined)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),release)
CXXFLAGS += -O2 -DNDEBUG
LDFLAGS += -s
endif
ifeq ($(MAKECMDGOALS),debug)
CXXFLAGS += -ggdb3
endif
#-----------------------------------------
# Set dependencies
#-----------------------------------------
SRC_FILES += $(wildcard src/*.cpp)
OBJ_FILES += $(addprefix obj/$(HASHDIR),$(notdir $(SRC_FILES:.cpp=.o)))
MK_FILES = $(filter-out .nse_depinfo$(POINTHASH), $(MAKEFILE_LIST))
obj/$(HASHDIR)%.o: $(MK_FILES)
$(CXX) $(CXXFLAGS) -c -o $@ $(filter %$(*F).cpp, $(SRC_FILES))
obj/$(HASHDIR)%.o: $(SRC_FILES:%.cpp)
$(CXX) $(CXXFLAGS) -c -o $@ $<
.nse_depinfo:
@touch $@
.nse_depinfo$(POINTHASH): $(SRC_FILES) .nse_depinfo
@$(CXX) $(CXXFLAGS) -M $^ 2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' | tee .nse_depinfo > .nse_depinfo$(POINTHASH)
ifneq ($(MAKECMDGOALS),clean)
@$(CXX) $(CXXFLAGS) -M $^ \
2>/dev/null | sed 's/\(.*\)\.o/obj\/$(HASHEDIR)\1.o/g' \
| tee .nse_depinfo > .nse_depinfo$(POINTHASH)
endif
-include .nse_depinfo$(POINTHASH)
#-----------------------------------------
# Main make entries
#-----------------------------------------
obj/$(HASHDIR)$(NAME_SRV):
bin
obj/$(HASH) $(OBJ_FILES)
obj/$(HASHDIR)$(NAME_SRV): obj/$(HASH) $(OBJ_FILES)
$(CXX) $(CXXFLAGS) $(OBJ_FILES) -o $@ $(LDFLAGS)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV) .nse_depinfo
$(POINTHASH)
bin/$(NAME_SRV): obj/$(HASHDIR)$(NAME_SRV)
bin
.nse_depinfo
@cp $< $@
clean:
...
...
@@ -91,13 +115,4 @@ clean:
bin obj/$(HASH):
@test -d $@ || mkdir -p $@
#-----------------------------------------
# Target specific options
#-----------------------------------------
release: CXXFLAGS += -O2 -DNDEBUG
release: LDFLAGS += -s
debug: CXXFLAGS += -ggdb3
.EXTRA_PREREQS+=$(foreach mk, ${MAKEFILE_LIST},$(abspath ${mk}))
.PHONY: clean
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment