mirror of
https://git.pwmt.org/pwmt/zathura.git
synced 2025-02-27 09:04:40 +01:00
honor CPPFLAGS
This commit is contained in:
parent
44360dea93
commit
8386b3abf4
3 changed files with 7 additions and 4 deletions
4
Makefile
4
Makefile
|
@ -30,12 +30,12 @@ options:
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(ECHO) CC $<
|
$(ECHO) CC $<
|
||||||
@mkdir -p .depend
|
@mkdir -p .depend
|
||||||
$(QUIET)${CC} -c ${CFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
|
$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
|
||||||
|
|
||||||
%.do: %.c
|
%.do: %.c
|
||||||
$(ECHO) CC $<
|
$(ECHO) CC $<
|
||||||
@mkdir -p .depend
|
@mkdir -p .depend
|
||||||
$(QUIET)${CC} -c ${CFLAGS} ${DFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
|
$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
|
||||||
|
|
||||||
# force recompilation of database.o if DATABASE has changed
|
# force recompilation of database.o if DATABASE has changed
|
||||||
database.o: database-${DATABASE}.o
|
database.o: database-${DATABASE}.o
|
||||||
|
|
|
@ -50,7 +50,9 @@ cc_open(girara_session_t* session, const char* input)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char cwd[path_max];
|
char cwd[path_max];
|
||||||
getcwd(cwd, path_max);
|
if (getcwd(cwd, path_max) == NULL) {
|
||||||
|
goto error_free;
|
||||||
|
}
|
||||||
|
|
||||||
char* tmp_path = g_strdup_printf("%s/%s", cwd, path);
|
char* tmp_path = g_strdup_printf("%s/%s", cwd, path);
|
||||||
if (tmp_path == NULL) {
|
if (tmp_path == NULL) {
|
||||||
|
|
|
@ -29,7 +29,8 @@ INCS = ${GIRARA_INC} ${GTK_INC}
|
||||||
LIBS = ${GIRARA_LIB} ${GTK_LIB} $(DL_LIB) -lpthread -lm
|
LIBS = ${GIRARA_LIB} ${GTK_LIB} $(DL_LIB) -lpthread -lm
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS) -DZATHURA_PLUGINDIR=\"${PLUGINDIR}\"
|
CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)
|
||||||
|
CPPFLAGS += -DZATHURA_PLUGINDIR=\"${PLUGINDIR}\"
|
||||||
|
|
||||||
# debug
|
# debug
|
||||||
DFLAGS ?= -g
|
DFLAGS ?= -g
|
||||||
|
|
Loading…
Add table
Reference in a new issue