$NetBSD: patch-aa,v 1.2 2016/09/01 12:58:46 mef Exp $ --- Makefile.orig 2003-12-29 20:11:57.000000000 +0900 +++ Makefile 2016-09-01 21:44:20.000000000 +0900 @@ -5,7 +5,7 @@ NAME = shlight INCLUDES = -Iinclude -I. -THE_CC = gcc +THE_CC = ${CC} ############################################################################## ############################ System specific part ############################ @@ -15,11 +15,11 @@ THE_CC = gcc # translation. # For NEXTSTEP/OPENSTEP: -CFLAGS = -Wall -O2 -traditional-cpp -g +#CFLAGS = -Wall -O2 -traditional-cpp -g # put your architecture here: -ARCH = -arch i386 -THE_CC = cc -RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized +#ARCH = -arch i386 +#THE_CC = cc +#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized # For Linux: (use static linking because of libc5/libc6 troubles) #CFLAGS = -Wall -O2 -g @@ -37,9 +37,9 @@ RPC_WARNFLAGS = -Wno-unused -Wno-switch #RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized # For NetBsd -#CFLAGS = -Wall -O2 -DNETBSD +CFLAGS = -Wall -O2 -DNETBSD #THE_CC = cc -#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized +RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized # For BSDI #CFLAGS= -Wall -O2 @@ -67,22 +67,21 @@ RPC_WARNFLAGS = -Wno-unused -Wno-switch ######################## End of system specific part ######################### ############################################################################## -LD = ld -CC = $(THE_CC) $(INCLUDES) -STRIP = strip +LD = ${LD} +STRIP = ${STRIP} OFILES = proc.o recode.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o .c.o: - $(CC) $(CFLAGS) $(ARCH) -c -o $*.o $< + $(CC) $(INCLUDES) $(CFLAGS) $(ARCH) -c -o $*.o $< all: $(NAME) nfs_dir: - (cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)") + (cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)") $(NAME): $(OFILES) nfs_dir - $(CC) $(LDFLAGS) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS) + $(CC) $(INCLUDES) $(LDFLAGS) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS) clean: rm -f $(OFILES)