No longer force inclusion of $(PREFIX)/include
This commit is contained in:
parent
6dc3e6eab9
commit
430cdc92e7
|
@ -3,11 +3,10 @@ PREFIX = /usr/local
|
||||||
DESTDIR =
|
DESTDIR =
|
||||||
LIBDIR = $(PREFIX)/lib
|
LIBDIR = $(PREFIX)/lib
|
||||||
CC = cc
|
CC = cc
|
||||||
CPPFLAGSF= -I ../include -I $(PREFIX)/include
|
CPPFLAGSF= -I ../include
|
||||||
CPPFLAGS=
|
CPPFLAGS= -I $(PREFIX)/include
|
||||||
CFLAGSF = -W -fPIC `pkg-config --cflags libSystem`
|
CFLAGSF = -W -fPIC `pkg-config --cflags libSystem`
|
||||||
CFLAGS = -Wall -g -O2 -pedantic
|
CFLAGS = -Wall -g -O2 -pedantic
|
||||||
LDFLAGSF= `pkg-config --libs libSystem`
|
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
AR = ar -rc
|
AR = ar -rc
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
|
@ -22,7 +21,7 @@ all: $(TARGETS)
|
||||||
|
|
||||||
libApp_OBJS = appclient.o appinterface.o appserver.o
|
libApp_OBJS = appclient.o appinterface.o appserver.o
|
||||||
libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||||
libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem`
|
||||||
|
|
||||||
libApp.a: $(libApp_OBJS)
|
libApp.a: $(libApp_OBJS)
|
||||||
$(AR) libApp.a $(libApp_OBJS)
|
$(AR) libApp.a $(libApp_OBJS)
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
targets=libApp
|
targets=libApp
|
||||||
cppflags_force=-I ../include -I $(PREFIX)/include
|
cppflags_force=-I ../include
|
||||||
cppflags=
|
cppflags=-I $(PREFIX)/include
|
||||||
cflags_force=-W -fPIC `pkg-config --cflags libSystem`
|
cflags_force=-W -fPIC `pkg-config --cflags libSystem`
|
||||||
cflags=-Wall -g -O2 -pedantic
|
cflags=-Wall -g -O2 -pedantic
|
||||||
ldflags_force=`pkg-config --libs libSystem`
|
|
||||||
ldflags=
|
ldflags=
|
||||||
dist=Makefile,appinterface.h
|
dist=Makefile,appinterface.h
|
||||||
|
|
||||||
[libApp]
|
[libApp]
|
||||||
type=library
|
type=library
|
||||||
sources=appclient.c,appinterface.c,appserver.c
|
sources=appclient.c,appinterface.c,appserver.c
|
||||||
ldflags=-ldl -lsocket
|
ldflags=`pkg-config --libs libSystem` -ldl -lsocket
|
||||||
install=$(LIBDIR)
|
install=$(LIBDIR)
|
||||||
|
|
|
@ -3,8 +3,8 @@ PREFIX = /usr/local
|
||||||
DESTDIR =
|
DESTDIR =
|
||||||
BINDIR = $(PREFIX)/bin
|
BINDIR = $(PREFIX)/bin
|
||||||
CC = cc
|
CC = cc
|
||||||
CPPFLAGSF= -I ../include -I $(PREFIX)/include
|
CPPFLAGSF= -I ../include
|
||||||
CPPFLAGS=
|
CPPFLAGS= -I $(PREFIX)/include
|
||||||
CFLAGSF = -W
|
CFLAGSF = -W
|
||||||
CFLAGS = -Wall -g -O2 -pedantic
|
CFLAGS = -Wall -g -O2 -pedantic
|
||||||
LDFLAGSF= -lApp -L../src
|
LDFLAGSF= -lApp -L../src
|
||||||
|
|
Loading…
Reference in New Issue
Block a user