Commit 5d406f8d authored by korbb's avatar korbb
Browse files

enable fixincludes for BeOS

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38038 138bc75d-0d04-0410-961f-82ee72b054a4
parent 99e8cf0c
2000-12-05 Bruce Korb <bkorb@gnu.org>
* fixinc/Makefile.*: make these more consistent
* fixinc/mkfixincl.sh: enable BeOS fixincludes
2000-12-05 Richard Henderson <rth@redhat.com> 2000-12-05 Richard Henderson <rth@redhat.com>
* stmt.c (warn_if_unused_value): Move side effects test earlier. * stmt.c (warn_if_unused_value): Move side effects test earlier.
......
# Makefile for GNU compilers on a Be box.
#
# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
#This file is part of GNU CC.
#GNU CC is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2, or (at your option)
#any later version.
#GNU CC is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#You should have received a copy of the GNU General Public License
#along with GNU CC; see the file COPYING. If not, write to
#the Free Software Foundation, 59 Temple Place - Suite 330,
#Boston, MA 02111-1307, USA.
# This Makefile.BEOS file lives in the fixinc subdirectory.
# Its purpose is to build the fixincl and applyfix programs for
# the Be port of GCC.
FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -DSEPARATE_FIX_PROC
target=i586-pc-beos
# Directory where sources are, from where we are.
VPATH = $(srcdir)
subdir = fixinc
# End of variables for you to override.
default : all
# Now figure out from those variables how to compile and link.
# Specify the directories to be searched for header files.
# Both . and srcdir are used, in that order.
#
INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. \
-I$(srcdir)/../config -I$(srcdir)/../../include
# Always use -I$(srcdir)/config when compiling.
.c.o:
$(CC) -c $(FIXINC_DEFS) $<
# The only suffixes we want for implicit rules are .c and .o.
.SUFFIXES:
.SUFFIXES: .c .o
#
## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
##
## Makefile for constructing the "best" include fixer we can
##
## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
LIBERTY = ../../libiberty/libiberty.a
OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
gnu-regex.o fixlib.o
HDR = server.h gnu-regex.h fixlib.h machname.h
TARGETS = fixincl applyfix
all : $(TARGETS)
gen : $(srcdir)/fixincl.x
FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
fixincl: $(FIXINCL_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
applyfix: $(APPLY_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
$(OBJ) : $(HDR)
fixincl.o : $(srcdir)/fixincl.x fixincl.c
fixtests.o : fixtests.c
fixfixes.o : fixfixes.c $(srcdir)/fixincl.x
server.o : server.c
procopen.o : procopen.c
gnu-regex.o : gnu-regex.c
fixlib.o : fixlib.c
# 'machname.h' is built in the build directory.
# 'fixincl.x' in the source dir.
#
machname.h: ../specs
$(SHELL) $(srcdir)/genfixes $@
$(srcdir)/fixincl.x: fixincl.tpl inclhack.def
cd $(srcdir) ; $(SHELL) ./genfixes $@
clean:
rm -f *.o $(TARGETS) machname.h *~
maintainer-clean: clean
rm -f $(srcdir)/fixincl.x
# Build the executable and copy up into gcc dir.
# We still copy the script because we still have alternative scripts.
#
install-bin : $(TARGETS)
./fixincl -v
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
@if [ -f ./fixincl.sh ] ; \
then echo cp ./fixincl.sh ../fixinc.sh ; \
cp ./fixincl.sh ../fixinc.sh ; \
else echo cp $(srcdir)/fixincl.sh ../fixinc.sh ; \
cp $(srcdir)/fixincl.sh ../fixinc.sh ; fi
chmod 755 ../fixinc.sh
...@@ -23,16 +23,11 @@ ...@@ -23,16 +23,11 @@
# Its purpose is to build the fixincl and applyfix programs for # Its purpose is to build the fixincl and applyfix programs for
# the DJGPP (aka MS-DOS) port of GCC. # the DJGPP (aka MS-DOS) port of GCC.
CFLAGS = -Wall -g -O2
FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES) \ FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES) \
-D__MSDOS__ -DSEPARATE_FIX_PROC -D__MSDOS__ -DSEPARATE_FIX_PROC
CC = gcc
SHELL = /bin/sh
target=i386-pc-msdosdjgpp target=i386-pc-msdosdjgpp
# Directory where sources are, from where we are. # Directory where sources are, from where we are.
srcdir = .
VPATH = $(srcdir) VPATH = $(srcdir)
subdir = fixinc subdir = fixinc
...@@ -64,7 +59,7 @@ INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. \ ...@@ -64,7 +59,7 @@ INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. \
## ##
## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
LIBERTY = $(srcdir)/../../libiberty/libiberty.a LIBERTY = ../../libiberty/libiberty.a
OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
gnu-regex.o fixlib.o gnu-regex.o fixlib.o
...@@ -73,22 +68,22 @@ HDR = server.h gnu-regex.h fixlib.h machname.h ...@@ -73,22 +68,22 @@ HDR = server.h gnu-regex.h fixlib.h machname.h
TARGETS = fixincl.exe applyfix.exe TARGETS = fixincl.exe applyfix.exe
all : $(TARGETS) all : $(TARGETS)
gen : fixincl.x gen : $(srcdir)/fixincl.x
FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
fixincl.exe: $(FIXINCL_OBJ) $(LIBERTY) fixincl.exe: $(FIXINCL_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) -o $@ $(FIXINCL_OBJ) $(LIBERTY) $(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
applyfix.exe: $(APPLY_OBJ) $(LIBERTY) applyfix.exe: $(APPLY_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) -o $@ $(APPLY_OBJ) $(LIBERTY) $(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
$(OBJ) : $(HDR) $(OBJ) : $(HDR)
fixincl.o : fixincl.x fixincl.c fixincl.o : $(srcdir)/fixincl.x fixincl.c
fixtests.o : fixtests.c fixtests.o : fixtests.c
fixfixes.o : fixfixes.c fixincl.x fixfixes.o : fixfixes.c $(srcdir)/fixincl.x
server.o : server.c server.o : server.c
procopen.o : procopen.c procopen.o : procopen.c
gnu-regex.o : gnu-regex.c gnu-regex.o : gnu-regex.c
...@@ -100,11 +95,11 @@ fixlib.o : fixlib.c ...@@ -100,11 +95,11 @@ fixlib.o : fixlib.c
machname.h: ../specs machname.h: ../specs
$(SHELL) $(srcdir)/genfixes $@ $(SHELL) $(srcdir)/genfixes $@
fixincl.x: fixincl.tpl inclhack.def $(srcdir)/fixincl.x: fixincl.tpl inclhack.def
cd $(srcdir) ; $(SHELL) ./genfixes $@ cd $(srcdir) ; $(SHELL) ./genfixes $@
clean: clean:
rm -f *.o $(TARGETS) machname.h *~ *.exe rm -f *.o $(TARGETS) machname.h *~
maintainer-clean : clean maintainer-clean : clean
rm -f $(srcdir)/fixincl.x rm -f $(srcdir)/fixincl.x
...@@ -112,7 +107,7 @@ maintainer-clean : clean ...@@ -112,7 +107,7 @@ maintainer-clean : clean
# Build the executable and copy up into gcc dir. # Build the executable and copy up into gcc dir.
# We still copy the script because we still have alternative scripts. # We still copy the script because we still have alternative scripts.
# #
inst-bin : $(TARGETS) install-bin : $(TARGETS)
./fixincl.exe -v ./fixincl.exe -v
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \ @if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
......
# Makefile for GNU compilers. # Makefile for GNU compilers.
#
# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. # Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
#This file is part of GNU CC. #This file is part of GNU CC.
...@@ -21,16 +22,12 @@ ...@@ -21,16 +22,12 @@
# The makefile built from this file lives in the fixinc subdirectory. # The makefile built from this file lives in the fixinc subdirectory.
# Its purpose is to build the any-platforms fixinc.sh script. # Its purpose is to build the any-platforms fixinc.sh script.
CFLAGS = -g
FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES) FIXINC_DEFS = -DIN_GCC $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
CC = @CC@
SHELL = /bin/sh
target=@target@ target=@target@
# Directory where sources are, from where we are. # Directory where sources are, from where we are.
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = $(srcdir)
subdir = fixinc subdir = fixinc
# End of variables for you to override. # End of variables for you to override.
...@@ -85,7 +82,7 @@ gnu-regex.o : gnu-regex.c ...@@ -85,7 +82,7 @@ gnu-regex.o : gnu-regex.c
fixlib.o : fixlib.c fixlib.o : fixlib.c
# 'machname.h' is built in the build directory. # 'machname.h' is built in the build directory.
# '$(srcdir)/fixincl.x' in the source dir. # 'fixincl.x' in the source dir.
# #
machname.h: ../specs machname.h: ../specs
$(SHELL) $(srcdir)/genfixes $@ $(SHELL) $(srcdir)/genfixes $@
...@@ -94,7 +91,7 @@ $(srcdir)/fixincl.x: fixincl.tpl inclhack.def ...@@ -94,7 +91,7 @@ $(srcdir)/fixincl.x: fixincl.tpl inclhack.def
cd $(srcdir) ; $(SHELL) ./genfixes $@ cd $(srcdir) ; $(SHELL) ./genfixes $@
clean: clean:
rm -f *.o $(TARGETS) machname.h *~ *.exe rm -f *.o $(TARGETS) machname.h *~
maintainer-clean : clean maintainer-clean : clean
rm -f $(srcdir)/fixincl.x rm -f $(srcdir)/fixincl.x
...@@ -102,7 +99,7 @@ maintainer-clean : clean ...@@ -102,7 +99,7 @@ maintainer-clean : clean
# Build the executable and copy up into gcc dir. # Build the executable and copy up into gcc dir.
# We still copy the script because we still have alternative scripts. # We still copy the script because we still have alternative scripts.
# #
install-bin : fixincl install-bin : $(TARGETS)
./fixincl -v ./fixincl -v
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \ @if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
......
...@@ -30,9 +30,6 @@ case $build in ...@@ -30,9 +30,6 @@ case $build in
*-*-beos* ) *-*-beos* )
MAKE="${MAKE} -f ${srcdir}/Makefile.BEOS srcdir=${srcdir}" MAKE="${MAKE} -f ${srcdir}/Makefile.BEOS srcdir=${srcdir}"
# Remove the following line to enable fixincludes
# (Makefile.BEOS is empty until Monday 12/4/00 :)
fixincludes=
;; ;;
* ) * )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment