summaryrefslogtreecommitdiff
path: root/devel/cvs/patches/patch-ac
blob: 60a9fe4fe536e82461a07f676f05c4ad787f1551 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:22 agc Exp $

*** src/Makefile.in.orig	Fri Sep 27 05:32:45 1996
--- src/Makefile.in	Mon Nov 17 01:49:22 1997
***************
*** 151,160 ****
  
  # Linking rules.
  
! $(PROGS): ../lib/libcvs.a ../zlib/libz.a
  
  cvs: $(OBJECTS)
! 	$(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a $(LIBS) $(LDFLAGS) -o $@ 
  
  xlint: $(SOURCES)
  	files= ; \
--- 151,162 ----
  
  # Linking rules.
  
! #$(PROGS): ../lib/libcvs.a ../zlib/libz.a
! $(PROGS): ../lib/libcvs.a
  
  cvs: $(OBJECTS)
! #	$(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a $(LIBS) $(LDFLAGS) -o $@ 
! 	$(CC) $(OBJECTS) ../lib/libcvs.a -lz $(LIBS) $(LDFLAGS) -o $@ 
  
  xlint: $(SOURCES)
  	files= ; \
***************
*** 185,191 ****
  $(OBJECTS): $(HEADERS) options.h
  
  zlib.o: zlib.c
! 	$(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/zlib $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
  
  subdir = src
  Makefile: ../config.status Makefile.in
--- 187,194 ----
  $(OBJECTS): $(HEADERS) options.h
  
  zlib.o: zlib.c
! #	$(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/zlib $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
! 	$(CC) $(CPPFLAGS) $(INCLUDES) -I/usr/include $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
  
  subdir = src
  Makefile: ../config.status Makefile.in