head	1.3;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.3
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.3
	RELEASE_7_2_0:1.3
	RELEASE_7_1_0:1.3
	RELEASE_6_4_0:1.3
	RELEASE_5_EOL:1.3
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.3
	RELEASE_4_EOL:1.3
	RELEASE_6_2_0:1.3
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.3
	RELEASE_5_4_0:1.3
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.3
	RELEASE_4_10_0:1.3
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.3
	RELEASE_4_8_0:1.3
	RELEASE_5_0_0:1.3
	RELEASE_4_7_0:1.3
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2002.09.05.02.49.33;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	2000.05.28.03.25.16;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.29.07.15.14;	author steve;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Respect CC and CXX, and don't depend on obsoleted header <values.h>
for a definition of BITSPERBYTE
@
text
@--- Makefile.orig	Mon Apr 19 10:38:56 1999
+++ Makefile	Wed Sep  4 19:46:45 2002
@@@@ -10,8 +10,8 @@@@
 
 # Default compilers and linker
 
-CC	= gcc
-CXX	= g++
+CC	?= cc
+CXX	?= c++
 LD	= $(CXX)
 
 # OS-dependent definitions (choose one and adjust, if necessary)
@@@@ -99,21 +99,21 @@@@
 
 ## for Linux (glibc2/libc 6):
 #
-COPTS   = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
-	 -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
-	 -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
-	 -D__s32=int\
-	 -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
-LFLAGS= -lcrypt
+#COPTS   = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
+#	 -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
+#	 -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+#	 -D__s32=int\
+#	 -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
+#LFLAGS= -lcrypt
 
 ## for FreeBSD 2.2:
 #
-#COPTS   = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\
-#	 -D__s32=int -DMMAPPAGESIZE=65536\
-#	 -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
-#	 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
-#	 -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
-#LFLAGS = -lcrypt
+COPTS   = -fno-strength-reduce -DLS_OPTIONS_IGNORE\
+	 -D__s32=int -DMMAPPAGESIZE=65536\
+	 -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
+	 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+	 -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
+LFLAGS = -lcrypt
 
 # End of OS-dependent definitions
 
@@@@ -126,8 +126,8 @@@@
 # Don't modify anything below
 
 CXXOPTS	= $(COPTS)
-CXXFLAGS = $(CXXOPTS) $(DEBUG)
-CFLAGS = $(COPTS) $(DEBUG)
+CXXFLAGS += $(CXXOPTS) $(DEBUG)
+CFLAGS += $(COPTS) $(DEBUG)
 
 FHTTPD_OFILES	= pseudopoll.o lists.o wildmat.o util.o configfile.o users.o \
 	 process.o log.o loadedfile.o sockobj.o configargs.o fhttpd.o
@


1.2
log
@Don't add -O2 to CFLAGS.  Make this port honor CFLAGS and CXXFLAGS.  Fix
build for -current.
@
text
@d1 13
a13 2
--- Makefile.orig	Mon Apr 19 12:38:56 1999
+++ Makefile	Sat May 27 14:51:57 2000
@


1.1
log
@Adding fhttpd version 0.4.2.
A C++-based FTP/HTTP server that supports modules.

PR:		15804
Submitted by:	Will Andrews <andrews@@technologist.com>
@
text
@d1 2
a2 2
--- Makefile	Mon Apr 19 13:38:56 1999
+++ Makefile.new	Fri Dec 24 00:14:18 1999
d28 1
a28 1
+COPTS   = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\
d37 11
@

