--- Makefile.orig Wed Apr 6 05:54:30 2005 +++ Makefile Fri Dec 9 07:41:26 2005 @@ -1,18 +1,15 @@ -FLTK = ../fltk -PDF = ../PDFlib-Lite-6.0.1/libs/pdflib -X11 = /usr/X11R6 CXX = g++ -CFLAGS = -Dunix -U__APPLE__ -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include +CFLAGS+= -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include OBJECTS = seaview.o pdf.o custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o old_file_chooser.o seaview : $(OBJECTS) - $(CXX) -o $@ $(OBJECTS) -L$(FLTK)/lib -lfltk \ - -Xlinker -Bstatic -L$(PDF)/.libs -lpdf -Xlinker -Bdynamic \ - -L$(X11)/lib -lX11 -lm + $(CXX) -o $@ $(OBJECTS) -L$(LOCALBASE)/lib -lfltk \ + -Xlinker -Bstatic -lpdf -Xlinker -Bdynamic \ + -L$(X11BASE)/lib -lX11 -lm strip $@