mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
(ALL_CPPFLAGS): Look in src for includes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@481 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f7efb29893
commit
538a5f5147
1 changed files with 13 additions and 12 deletions
|
@ -35,17 +35,18 @@ CPPFLAGS =
|
|||
LDFLAGS =
|
||||
|
||||
DEFS = @DEFS@
|
||||
LIBS = -L$(srcdir)/.. -lobjects @LIBOBJC@ @LIBS@
|
||||
LIBS = -L$(srcdir)/../src -lobjects @LIBOBJC@ @LIBS@
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
include $(srcdir)/../Makeconf
|
||||
|
||||
# xxx Is this needed anymore?
|
||||
NEXT_NEXT_INCLUDES = -I/usr/include
|
||||
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../objects/next-include
|
||||
NEXT_INCLUDES = @NEXT_INCLUDES@
|
||||
|
||||
ALL_CPPFLAGS = -I$(srcdir)/.. $(NEXT_INCLUDES) $(CPPFLAGS)
|
||||
ALL_CPPFLAGS = -I$(srcdir)/../src $(NEXT_INCLUDES) $(CPPFLAGS)
|
||||
ALL_CFLAGS = $(CFLAGS)
|
||||
ALL_OBJCFLAGS = $(CFLAGS) -Wno-protocol
|
||||
ALL_LDFLAGS = $(LDFLAGS) $(LIBS)
|
||||
|
@ -77,29 +78,29 @@ EXCS = $(SRCS:.m=)
|
|||
all: $(EXCS)
|
||||
|
||||
# This works for GNU make, but not others.
|
||||
# %: %.o $(srcdir)/../libobjects.a
|
||||
# %: %.o $(srcdir)/../src/libobjects.a
|
||||
# $(CC) $(ALL_CFLAGS) $< -o $@ $(ALL_LDFLAGS)
|
||||
# How can I do this in a better way than the ugliness below?
|
||||
# (but also have it work on old-style /bin/make)
|
||||
|
||||
LINK_CMD = $(CC) $(ALL_CFLAGS) $@.o -o $@ $(ALL_LDFLAGS)
|
||||
dictionary: dictionary.o $(srcdir)/../libobjects.a
|
||||
dictionary: dictionary.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
stdio-stream: stdio-stream.o $(srcdir)/../libobjects.a
|
||||
stdio-stream: stdio-stream.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
textcoding: textcoding.o $(srcdir)/../libobjects.a
|
||||
textcoding: textcoding.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
port-server: port-server.o $(srcdir)/../libobjects.a
|
||||
port-server: port-server.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
port-client: port-client.o $(srcdir)/../libobjects.a
|
||||
port-client: port-client.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
first-server: first-server.o $(srcdir)/../libobjects.a
|
||||
first-server: first-server.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
first-client: first-client.o $(srcdir)/../libobjects.a
|
||||
first-client: first-client.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
second-server: second-server.o $(srcdir)/../libobjects.a
|
||||
second-server: second-server.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
second-client: second-client.o $(srcdir)/../libobjects.a
|
||||
second-client: second-client.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
|
||||
first: first-server first-client
|
||||
|
|
Loading…
Reference in a new issue