[i-c] Use -I in Makefiles to avoid full path in .c

Use -I to indicate the path to the libraries (libowlps &
libowlps-client), instead of indicating the path into the source files.
This commit is contained in:
Matteo Cypriani 2011-03-17 14:06:44 +01:00
parent f832335f12
commit 0b744995f4
12 changed files with 45 additions and 25 deletions

View File

@ -21,7 +21,8 @@ HEADER=owlps-client.h
OBJS=$(LIB_CIBLE).o OBJS=$(LIB_CIBLE).o
# Flags # Flags
CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I. LIBOWLPS_DIR = ../../libowlps
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
DEPFLAGS=-MMD DEPFLAGS=-MMD
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG=-fPIC PICFLAG=-fPIC

View File

@ -21,7 +21,8 @@ HEADER=owlps-client.h
OBJS=$(LIB_CIBLE).o OBJS=$(LIB_CIBLE).o
# Flags # Flags
CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I. LIBOWLPS_DIR = ../../libowlps
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
DEPFLAGS=-MMD DEPFLAGS=-MMD
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG=-fPIC PICFLAG=-fPIC

View File

@ -6,7 +6,7 @@
#ifndef _LIBOWLPS_CLIENT_ #ifndef _LIBOWLPS_CLIENT_
#define _LIBOWLPS_CLIENT_ #define _LIBOWLPS_CLIENT_
#include "../../libowlps/owlps.h" #include <owlps.h>
/* Error codes */ /* Error codes */
#define ERR_CREATING_SOCKET 151 // Error when creating output socket #define ERR_CREATING_SOCKET 151 // Error when creating output socket

View File

@ -20,12 +20,13 @@ TARGET=owlps-aggregatord
HEADER=owlps-aggregator.h HEADER=owlps-aggregator.h
# Flags # Flags
CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I. LIBOWLPS_DIR = ../../libowlps
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
DEPFLAGS=-MMD DEPFLAGS=-MMD
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG=-fPIC PICFLAG=-fPIC
OWLPSFLAGS = -D USE_TIMESTAMP OWLPSFLAGS = -D USE_TIMESTAMP
LIBS = -pthread -lconfuse -L../../libowlps -lowlps LIBS = -pthread -lconfuse -L$(LIBOWLPS_DIR) -lowlps
LDFLAGS = $(LIBS) $(OWLPSFLAGS) LDFLAGS = $(LIBS) $(OWLPSFLAGS)

View File

@ -5,7 +5,8 @@
#ifndef _OWLPS_AGGREGATOR_H_ #ifndef _OWLPS_AGGREGATOR_H_
#define _OWLPS_AGGREGATOR_H_ #define _OWLPS_AGGREGATOR_H_
#include "../../libowlps/owlps.h" #include <owlps.h>
#include <confuse.h> #include <confuse.h>
#define DEBUG #define DEBUG

View File

@ -20,11 +20,14 @@ TARGET=owlps-client
HEADER= HEADER=
# Flags # Flags
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I. LIBOWLPS_DIR = ../../libowlps
LIBOWLPSCLIENT_DIR = ../libowlps-client
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
DEPFLAGS = -MMD DEPFLAGS = -MMD
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG = -fPIC PICFLAG = -fPIC
LIBS = -L../../libowlps -lowlps -L../libowlps-client -lowlps-client LIBS = -L$(LIBOWLPS_DIR) -lowlps -L$(LIBOWLPSCLIENT_DIR) -lowlps-client
STATIC_LIBS = -liw -lm -lrt STATIC_LIBS = -liw -lm -lrt

View File

@ -23,13 +23,16 @@ TARGET=owlps-client
HEADER= HEADER=
# Flags # Flags
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I. LIBOWLPS_DIR = ../../libowlps
LIBOWLPSCLIENT_DIR = ../libowlps-client
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
DEPFLAGS = -MMD DEPFLAGS = -MMD
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG = -fPIC PICFLAG = -fPIC
LOWLPS = -L../../libowlps -lowlps LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
LOWLPSA = ../../libowlps/libowlps.a LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
LOWLPSCLIENTA = ../libowlps-client/libowlps-client.a LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
LIBS = $(LOWLPSCLIENTA) -liw -lm LIBS = $(LOWLPSCLIENTA) -liw -lm
DYNAMIC_LIBS = $(LOWLPS) $(LIBS) DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS) SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)

View File

@ -23,13 +23,16 @@ TARGET=owlps-client
HEADER= HEADER=
# Flags # Flags
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I. LIBOWLPS_DIR = ../../libowlps
LIBOWLPSCLIENT_DIR = ../libowlps-client
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
DEPFLAGS = -MMD DEPFLAGS = -MMD
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG = -fPIC PICFLAG = -fPIC
LOWLPS = -L../../libowlps -lowlps LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
LOWLPSA = ../../libowlps/libowlps.a LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
LOWLPSCLIENTA = ../libowlps-client/libowlps-client.a LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
LIBS = $(LOWLPSCLIENTA) -liw -lm LIBS = $(LOWLPSCLIENTA) -liw -lm
DYNAMIC_LIBS = $(LOWLPS) $(LIBS) DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS) SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)

View File

@ -2,7 +2,7 @@
* This file is part of the rtap localisation project. * This file is part of the rtap localisation project.
*/ */
#include "../libowlps-client/owlps-client.h" #include <owlps-client.h>
#define DEBUG #define DEBUG

View File

@ -20,12 +20,16 @@ TARGET=owlps-listenerd
HEADER=owlps-listener.h HEADER=owlps-listener.h
# Flags # Flags
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I. LIBOWLPS_DIR = ../../libowlps
LIBOWLPSCLIENT_DIR = ../libowlps-client
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
DEPFLAGS = -MMD DEPFLAGS = -MMD
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG = -fPIC PICFLAG = -fPIC
OWLPSFLAGS = -D USE_CONFIG_FILE -lconfuse -D USE_PTHREAD -pthread OWLPSFLAGS = -D USE_CONFIG_FILE -lconfuse -D USE_PTHREAD -pthread
LIBS = -L../../libowlps -lowlps -L../libowlps-client -lowlps-client \ LIBS = -L$(LIBOWLPS_DIR) -lowlps \
-L$(LIBOWLPSCLIENT_DIR) -lowlps-client \
-lpcap -liw -lm -lpcap -liw -lm
LDFLAGS = $(LIBS) $(OWLPSFLAGS) LDFLAGS = $(LIBS) $(OWLPSFLAGS)

View File

@ -23,13 +23,16 @@ TARGET=owlps-listenerd
HEADER=owlps-listener.h HEADER=owlps-listener.h
# Flags # Flags
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I. LIBOWLPS_DIR = ../../libowlps
LIBOWLPSCLIENT_DIR = ../libowlps-client
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
DEPFLAGS = -MMD DEPFLAGS = -MMD
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
PICFLAG = -fPIC PICFLAG = -fPIC
LOWLPS = -L../../libowlps -lowlps LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
LOWLPSA = ../../libowlps/libowlps.a LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
LOWLPSCLIENTA = ../libowlps-client/libowlps-client.a LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
LIBS = -lpcap -liw -lm $(LOWLPSCLIENTA) LIBS = -lpcap -liw -lm $(LOWLPSCLIENTA)
LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib
IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include

View File

@ -14,8 +14,8 @@
#define DEBUG #define DEBUG
#include "../../libowlps/owlps.h" #include <owlps.h>
#include "../libowlps-client/owlps-client.h" #include <owlps-client.h>
#include <pcap.h> #include <pcap.h>