Include all local files relatively

This commit is contained in:
Benedikt Heine 2018-11-11 20:10:29 +01:00
parent 8c192f3c28
commit a6abfdf7c5
11 changed files with 25 additions and 25 deletions

View File

@ -42,8 +42,8 @@ $(error "$(PKG_CONFIG) failed!")
endif endif
endif endif
CFLAGS := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} -I. ${INCS} CFLAGS := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} ${INCS}
LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} -L. ${LIBS} LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} ${LIBS}
SRC := $(sort $(shell find src/ -name '*.c')) SRC := $(sort $(shell find src/ -name '*.c'))
OBJ := ${SRC:.c=.o} OBJ := ${SRC:.c=.o}

View File

@ -1,7 +1,7 @@
#ifndef DUNST_DRAW_H #ifndef DUNST_DRAW_H
#define DUNST_DRAW_H #define DUNST_DRAW_H
#include "src/x11/x.h" #include "x11/x.h"
extern struct window_x11 *win; // Temporary extern struct window_x11 *win; // Temporary
void draw_setup(void); void draw_setup(void);

View File

@ -7,7 +7,7 @@
#include <string.h> #include <string.h>
#include "rules.h" // put before config.h to fix missing include #include "rules.h" // put before config.h to fix missing include
#include "config.h" #include "../config.h"
#include "dunst.h" #include "dunst.h"
#include "log.h" #include "log.h"
#include "notification.h" #include "notification.h"

View File

@ -15,9 +15,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "src/log.h" #include "../log.h"
#include "src/settings.h" #include "../settings.h"
#include "src/utils.h" #include "../utils.h"
#include "x.h" #include "x.h"
struct screen_info *screens; struct screen_info *screens;

View File

@ -19,16 +19,16 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "src/draw.h" #include "../draw.h"
#include "src/dbus.h" #include "../dbus.h"
#include "src/dunst.h" #include "../dunst.h"
#include "src/log.h" #include "../log.h"
#include "src/markup.h" #include "../markup.h"
#include "src/menu.h" #include "../menu.h"
#include "src/notification.h" #include "../notification.h"
#include "src/queues.h" #include "../queues.h"
#include "src/settings.h" #include "../settings.h"
#include "src/utils.h" #include "../utils.h"
#include "screen.h" #include "screen.h"

View File

@ -22,7 +22,7 @@ struct keyboard_shortcut {
}; };
// Cyclical dependency // Cyclical dependency
#include "src/settings.h" #include "../settings.h"
struct window_x11; struct window_x11;

View File

@ -1,4 +1,4 @@
#include "src/markup.c" #include "../src/markup.c"
#include "greatest.h" #include "greatest.h"
TEST test_markup_strip(void) TEST test_markup_strip(void)

View File

@ -1,8 +1,8 @@
#include "src/notification.c" #include "../src/notification.c"
#include "greatest.h" #include "greatest.h"
#include "src/option_parser.h" #include "../src/option_parser.h"
#include "src/settings.h" #include "../src/settings.h"
extern const char *base; extern const char *base;

View File

@ -1,4 +1,4 @@
#include "src/option_parser.c" #include "../src/option_parser.c"
#include "greatest.h" #include "greatest.h"
extern const char *base; extern const char *base;

View File

@ -5,7 +5,7 @@
#include <libgen.h> #include <libgen.h>
#include <errno.h> #include <errno.h>
#include "src/log.h" #include "../src/log.h"
const char *base; const char *base;

View File

@ -1,4 +1,4 @@
#include "src/utils.c" #include "../src/utils.c"
#include "greatest.h" #include "greatest.h"
TEST test_string_replace_char(void) TEST test_string_replace_char(void)