mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Put src in all dependencies on libobjects.a.
(OBJECTS_NEXT_INCLUDES): Look in src directory. (LIBS): Likewise. (ALL_CPPFLAGS): Likewise. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@459 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
53061f082f
commit
ef397f6100
1 changed files with 26 additions and 25 deletions
|
@ -35,17 +35,18 @@ CPPFLAGS =
|
|||
LDFLAGS =
|
||||
|
||||
DEFS = @DEFS@
|
||||
LIBS = -L$(srcdir)/.. -lobjects @LIBOBJC@ @LIBS@ -lm
|
||||
LIBS = -L$(srcdir)/../src -lobjects @LIBOBJC@ @LIBS@ -lm
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
include $(srcdir)/../Makeconf
|
||||
|
||||
# Not needed anymore?
|
||||
NEXT_NEXT_INCLUDES = -I/usr/include
|
||||
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../objects/next-include
|
||||
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../src
|
||||
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)
|
||||
|
@ -91,54 +92,54 @@ DIST_FILES = NXStringTable.example
|
|||
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)
|
||||
test01: test01.o $(srcdir)/../libobjects.a
|
||||
test01: test01.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test02: test02.o $(srcdir)/../libobjects.a
|
||||
test02: test02.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test03: test03.o $(srcdir)/../libobjects.a
|
||||
test03: test03.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test04: test04.o $(srcdir)/../libobjects.a
|
||||
test04: test04.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test05: test05.o $(srcdir)/../libobjects.a
|
||||
test05: test05.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test06: test06.o $(srcdir)/../libobjects.a
|
||||
test06: test06.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test07: test07.o $(srcdir)/../libobjects.a
|
||||
test07: test07.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test08: test08.o $(srcdir)/../libobjects.a
|
||||
test08: test08.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test09: test09.o $(srcdir)/../libobjects.a
|
||||
test09: test09.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test10: test10.o $(srcdir)/../libobjects.a
|
||||
test10: test10.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test11: test11.o $(srcdir)/../libobjects.a
|
||||
test11: test11.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test12: test12.o $(srcdir)/../libobjects.a
|
||||
test12: test12.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
test13: test13.o $(srcdir)/../libobjects.a
|
||||
test13: test13.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
pipes: pipes.o $(srcdir)/../libobjects.a
|
||||
pipes: pipes.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
server: server.o $(srcdir)/../libobjects.a
|
||||
server: server.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
client: client.o $(srcdir)/../libobjects.a
|
||||
client: client.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
string: string.o $(srcdir)/../libobjects.a
|
||||
string: string.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
values: values.o $(srcdir)/../libobjects.a
|
||||
values: values.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
nsarray: nsarray.o $(srcdir)/../libobjects.a
|
||||
nsarray: nsarray.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
nsdictionary: nsdictionary.o $(srcdir)/../libobjects.a
|
||||
nsdictionary: nsdictionary.o $(srcdir)/../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
|
||||
#nsarchiving: nsarray.o $(srcdir)/../libobjects.a
|
||||
#nsarchiving: nsarray.o $(srcdir)/../src/libobjects.a
|
||||
# $(LINK_CMD)
|
||||
|
||||
install:
|
||||
|
|
Loading…
Reference in a new issue