mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Remove/rename all mention of `objects'.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1415 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
77ad38c067
commit
543db807ab
2 changed files with 7 additions and 29 deletions
|
@ -35,7 +35,7 @@ CPPFLAGS =
|
|||
LDFLAGS =
|
||||
|
||||
DEFS = @DEFS@
|
||||
LIBS = -L../src -lobjects @LIBOBJC@ @LIBS@ -lm
|
||||
LIBS = -L../src -l$(LIBRARY_NAME) @LIBOBJC@ @LIBS@ -lm
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
|
@ -44,7 +44,7 @@ include $(srcdir)/../Version
|
|||
|
||||
# xxx Is this needed anymore?
|
||||
NEXT_NEXT_INCLUDES = -I/usr/include
|
||||
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../src
|
||||
GNU_NEXT_INCLUDES = -I$(srcdir)/../src
|
||||
NEXT_INCLUDES = @NEXT_INCLUDES@
|
||||
|
||||
ALL_CPPFLAGS = -I../src -I$(srcdir)/../src $(NEXT_INCLUDES) $(CPPFLAGS)
|
||||
|
@ -79,30 +79,8 @@ EXCS = $(SRCS:.m=)
|
|||
all: $(EXCS)
|
||||
|
||||
# This works for GNU make, but not others.
|
||||
# %: %.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 ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
stdio-stream: stdio-stream.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
textcoding: textcoding.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
port-server: port-server.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
port-client: port-client.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
first-server: first-server.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
first-client: first-client.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
second-server: second-server.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
second-client: second-client.o ../src/libobjects.a
|
||||
$(LINK_CMD)
|
||||
%: %$(OEXT) $(srcdir)/../src/lib$(LIBRARY_NAME)(LIBEXT)
|
||||
$(CC) $(ALL_CFLAGS) $@$(OEXT) -o $@ $(ALL_LDFLAGS)
|
||||
|
||||
first: FORCE
|
||||
(cd ../src; $(MAKE))
|
||||
|
|
|
@ -38,7 +38,7 @@ DYNAMIC_BUNDLER_LINKER=@DYNAMIC_BUNDLER_LINKER@
|
|||
DYNAMIC_LDFLAGS=@DYNAMIC_LDFLAGS@
|
||||
DYNAMIC_CFLAGS=@DYNAMIC_CFLAGS@
|
||||
DEFS = @DEFS@
|
||||
LIBS = -L../src -lobjects @LIBOBJC@ @LIBS@ -lm
|
||||
LIBS = -L../src -l$(LIBRARY_NAME) @LIBOBJC@ @LIBS@ -lm
|
||||
|
||||
EXEEXT =
|
||||
OEXT = .o
|
||||
|
@ -51,7 +51,7 @@ include $(srcdir)/../Version
|
|||
|
||||
# Not needed anymore?
|
||||
NEXT_NEXT_INCLUDES = -I/usr/include
|
||||
OBJECTS_NEXT_INCLUDES = -I$(srcdir)/../src
|
||||
GNU_NEXT_INCLUDES = -I$(srcdir)/../src
|
||||
NEXT_INCLUDES = @NEXT_INCLUDES@
|
||||
|
||||
ALL_CPPFLAGS = -I../src -I$(srcdir)/../src $(NEXT_INCLUDES) $(CPPFLAGS)
|
||||
|
@ -131,7 +131,7 @@ DIST_FILES = $(RCS_FILES)
|
|||
all: $(EXCS)
|
||||
|
||||
# This works for GNU make, but not others.
|
||||
%: %$(OEXT) $(srcdir)/../src/libobjects$(LIBEXT)
|
||||
%: %$(OEXT) $(srcdir)/../src/lib$(LIBRARY_NAME)(LIBEXT)
|
||||
$(CC) $(ALL_CFLAGS) $@$(OEXT) -o $@ $(ALL_LDFLAGS)
|
||||
|
||||
install:
|
||||
|
|
Loading…
Reference in a new issue