Unbreak on -current. This should unlock another 6 ports that depend on this one.

Submitted by:	bento
This commit is contained in:
Maxim Sobolev 2002-10-21 11:12:13 +00:00
parent bd50152bf7
commit 04c2078afa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68499
2 changed files with 39 additions and 38 deletions

View file

@ -1,38 +1,22 @@
*** src/Makefile.common.orig Wed Mar 19 04:23:18 1997 --- src/Makefile.common.orig Tue Mar 18 21:23:18 1997
--- src/Makefile.common Mon Sep 8 04:14:24 1997 +++ src/Makefile.common Mon Oct 21 14:08:06 2002
*************** @@ -20,7 +20,7 @@
*** 20,26 ****
fpp: $(OBJ) $(OBJ1) $(EXTRA_LIB) fpp: $(OBJ) $(OBJ1) $(EXTRA_LIB)
$(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB) $(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB)
! $(OBJ): $$(@:%.o=$(SRC)/%.c) -$(OBJ): $$(@:%.o=$(SRC)/%.c)
+$(OBJ): #$$(@:%.o=$(SRC)/%.c)
$(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c) $(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c)
y.tab.o: y.tab.c y.tab.o: y.tab.c
--- 20,26 ---- @@ -34,8 +34,8 @@
fpp: $(OBJ) $(OBJ1) $(EXTRA_LIB)
$(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB)
! $(OBJ): #$$(@:%.o=$(SRC)/%.c)
$(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c)
y.tab.o: y.tab.c
***************
*** 34,41 ****
lint: $(LINTFILES) lint: $(LINTFILES)
$(LINT) $(LINTFILES) $(LINT) $(LINTFILES)
! $(LINTFILES): $$(@:%.ln=$(SRC)/%.c) -$(LINTFILES): $$(@:%.ln=$(SRC)/%.c)
! $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c) - $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c)
+#$(LINTFILES): $$(@:%.ln=$(SRC)/%.c)
clean: +# $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c)
$(RM) fpp *.o y.tab.c $(LINTFILES)
--- 34,41 ----
lint: $(LINTFILES)
$(LINT) $(LINTFILES)
! #$(LINTFILES): $$(@:%.ln=$(SRC)/%.c)
! # $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c)
clean: clean:
$(RM) fpp *.o y.tab.c $(LINTFILES) $(RM) fpp *.o y.tab.c $(LINTFILES)

View file

@ -0,0 +1,17 @@
$FreeBSD$
--- sparc/Makefile.orig Tue Mar 18 21:23:25 1997
+++ sparc/Makefile Mon Oct 21 14:10:57 2002
@@ -1,8 +1,8 @@
SRC = ../src
-CC = gcc
-COPTS = -ansi -O -w
-EXTRA_DEF = "-DRELEASE=\"v1.1\""
+CC ?= gcc
+COPTS = -ansi -w ${CFLAGS}
+EXTRA_DEF = "-DRELEASE=\"v1.1\"" -I../src
all: fpp