Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
pwmt
zathura
Commits
2498d5cf
Commit
2498d5cf
authored
Jan 24, 2017
by
Sebastian Ramacher
Browse files
Simplify source file filtering
parent
84a1f213
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
2498d5cf
...
...
@@ -5,16 +5,16 @@ include colors.mk
include
common.mk
# source files
OSOURCE
=
$(
sort
$(
wildcard
${PROJECT}
/
*
.c
)
\
${PROJECT}
/css-definitions.c
)
OSOURCE
=
$(
sort
$(
wildcard
${PROJECT}
/
*
.c
)
\
${PROJECT}
/css-definitions.c
)
SOURCE_FILTER
=
ifneq
(${WITH_SQLITE},0)
INCS
+=
$(SQLITE_INC)
LIBS
+=
$(SQLITE_LIB)
SOURCE
=
$(OSOURCE)
CPPFLAGS
+=
-DWITH_SQLITE
else
SOURCE
=
$(
filter-out
${PROJECT}
/database-sqlite.c
,
$(OSOURCE)
)
SOURCE
_FILTER
+=
${PROJECT}
/database-sqlite.c
endif
ifneq
($(WITH_MAGIC),0)
...
...
@@ -50,6 +50,7 @@ CPPFLAGS += -DDBUSINTERFACEDIR=\"${DBUSINTERFACEDIR}\"
endif
endif
SOURCE
=
$(
filter-out
$(SOURCE_FILTER)
,
$(OSOURCE)
)
OBJECTS
=
$(
addprefix
${BUILDDIR_RELEASE}
/,
${SOURCE:.c=.o}
)
OBJECTS_DEBUG
=
$(
addprefix
${BUILDDIR_DEBUG}
/,
${SOURCE:.c=.o}
)
OBJECTS_GCOV
=
$(
addprefix
${BUILDDIR_GCOV}
/,
${SOURCE:.c=.o}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment