- new focusmerge.dat for new merge type

This commit is contained in:
cvs
2001-04-27 08:37:42 +00:00
parent 8c2285026b
commit 63d84a85ad
11 changed files with 442 additions and 317 deletions

View File

@@ -7,63 +7,63 @@
#--------------------------------------------------------------------------
#------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
##CC = cc
##CFLAGS = -std -g -warnprotos -I. -I../hardsup
##BIN = osf.axp
##LFLAGS = -L../hardsup
CC = cc
CFLAGS = -std -g -warnprotos -I. -I../hardsup
BIN = ../bin
LFLAGS = -L../hardsup
#------------ for Linux
CC = gcc
CFLAGS = -g -I. -I../hardsup -DLinux
BIN = linux.i686
LFLAGS = -L../hardsup -L/usr/X11R6/lib
#CC = gcc
#CFLAGS = -g -I. -I../hardsup -DLinux
#BIN = linux.i686
#LFLAGS = -L../hardsup -L/usr/X11R6/lib
#------------
#----------------------------------------------------------
all: $(HOME)/bin/$(BIN)/asynsrv_test \
$(HOME)/bin/$(BIN)/el734 \
$(HOME)/bin/$(BIN)/el734_test \
$(HOME)/bin/$(BIN)/el737 \
$(HOME)/bin/$(BIN)/SerPortServer
all: $(BIN)/asynsrv_test \
$(BIN)/el734 \
$(BIN)/el734_test \
$(BIN)/el737 \
$(BIN)/SerPortServer
#----------------------------------------------------------
$(HOME)/bin/$(BIN)/SerPortServer: SerPortServer.c
rm -f $(HOME)/bin/$(BIN)/SerPortServer
$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/SerPortServer \
$(BIN)/SerPortServer: SerPortServer.c
rm -f $(BIN)/SerPortServer
$(CC) $(CFLAGS) -o $(BIN)/SerPortServer \
SerPortServer.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/asynsrv_test: asynsrv_test.c
rm -f $(HOME)/bin/$(BIN)/asynsrv_test
$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/asynsrv_test \
$(BIN)/asynsrv_test: asynsrv_test.c
rm -f $(BIN)/asynsrv_test
$(CC) $(CFLAGS) -o $(BIN)/asynsrv_test \
asynsrv_test.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/el734: el734.c
$(BIN)/el734: el734.c
@ echo "el734 needs Motif library. Not yet found on linux"
## rm -f $(HOME)/bin/$(BIN)/el734
## $(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/el734 \
## el734.c $(LFLAGS) -lhlib -lX11
rm -f $(BIN)/el734
$(CC) $(CFLAGS) -o $(BIN)/el734 \
el734.c $(LFLAGS) -lhlib -lX11 -lXm
$(HOME)/bin/$(BIN)/el734_test: el734_test.c
rm -f $(HOME)/bin/$(BIN)/el734_test
$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/el734_test \
$(BIN)/el734_test: el734_test.c
rm -f $(BIN)/el734_test
$(CC) $(CFLAGS) -o $(BIN)/el734_test \
el734_test.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/el737: el737.c
$(BIN)/el737: el737.c
@ echo "el737 needs Motif library. Not yet found on linux"
## rm -f $(HOME)/bin/$(BIN)/el737
## $(CC) $(CFLAGS) -I/usr/X11R6/include -o $(HOME)/bin/$(BIN)/el737 \
## el737.c $(LFLAGS) -lhlib -lXm -lXt -lX11
rm -f $(BIN)/el737
$(CC) $(CFLAGS) -I/usr/X11R6/include -o $(BIN)/el737 \
el737.c $(LFLAGS) -lhlib -lXm -lXt -lX11 -lm
#----------------------------------------------------------
clean:
- rm -f *.o
- rm -f $(HOME)/bin/$(BIN)/SerPortServer \
$(HOME)/bin/$(BIN)/asynsrv_test \
$(HOME)/bin/$(BIN)/el734 \
$(HOME)/bin/$(BIN)/el734_test \
$(HOME)/bin/$(BIN)/el737
- rm -f $(BIN)/SerPortServer \
$(BIN)/asynsrv_test \
$(BIN)/el734 \
$(BIN)/el734_test \
$(BIN)/el737
#----------------------------------------------------------
.c.o:
$(CC) $(CFLAGS) -c $*.c

View File

@@ -388,7 +388,7 @@
#include <time.h>
struct timespec delay = {0, 250000000};
struct timespec delay_left;
#define hibernate nanosleep (&delay, &delay_left)
#define hibernate nanosleep_d9 (&delay, &delay_left)
#endif
int i, msr, ss, s_stat;
int my_verbose;