diff -Naur xephem-3.7.4-RC7ORIG/GUI/xephem/Makefile xephem-3.7.4-RC7/GUI/xephem/Makefile
--- xephem-3.7.4-RC7ORIG/GUI/xephem/Makefile    2009-01-06 12:29:42.741376780 +0000
+++ xephem-3.7.4-RC7/GUI/xephem/Makefile        2009-01-07 11:52:25.781140384 +0000
@@ -10,8 +10,8 @@
 # one executable, xephem.
 
 # These -I and -L flags point to the supporting XEphem libraries
-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd
+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd
 LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
 
 # MOTIFI is the directory containing the Xm directory of include files.
@@ -34,9 +34,9 @@
 # some systems now use just /usr/X11 (not /usr/X11R6)
 CC = gcc
 CLDFLAGS = -g
-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -march=nocona -D_GNU_SOURCE -Wall -I/usr/include -I/usr/X11/include
+LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L/usr/lib64 -L/usr/X11/lib
+XLIBS = /usr/lib64/libXm.a -lXp -lXt -lXext -lXmu -lX11
 LIBS = $(XLIBS) $(LIBLIB) -lm
 
 # for ppc Apple OS X to make universal (i386 and ppc binary), requires
@@ -191,8 +191,8 @@
        cd ../../libip; make
        cd ../../libjpegd; make
        cd ../../liblilxml; make
-       cd ../../libpng; make
-       cd ../../libz; make
+       #cd ../../libpng; make
+       #cd ../../libz; make
 
 clean:
        rm -fr *.o ../../lib*/*.[ao]
diff -Naur xephem-3.7.4-RC7ORIG/libastro/Makefile xephem-3.7.4-RC7/libastro/Makefile
--- xephem-3.7.4-RC7ORIG/libastro/Makefile      2009-01-06 12:29:42.760376721 +0000
+++ xephem-3.7.4-RC7/libastro/Makefile  2009-01-08 13:58:41.117140284 +0000
@@ -5,7 +5,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -O2 -Wall
+CFLAGS= -O2 -march=nocona -D_GNU_SOURCE -Wall
 
 # macosx universal binary
 # CFLAGS= -O2 -Wall -arch i386 -arch ppc
diff -Naur xephem-3.7.4-RC7ORIG/libip/Makefile xephem-3.7.4-RC7/libip/Makefile
--- xephem-3.7.4-RC7ORIG/libip/Makefile 2009-01-06 12:29:42.723376735 +0000
+++ xephem-3.7.4-RC7/libip/Makefile     2009-01-08 13:58:15.696125101 +0000
@@ -3,7 +3,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -I../libastro -O2 -Wall
+CFLAGS= -I../libastro -O2 -march=nocona -D_GNU_SOURCE -Wall
 
 # macosx universal binary
 # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
diff -Naur xephem-3.7.4-RC7ORIG/libjpegd/Makefile xephem-3.7.4-RC7/libjpegd/Makefile
--- xephem-3.7.4-RC7ORIG/libjpegd/Makefile      2009-01-06 12:29:42.762376721 +0000
+++ xephem-3.7.4-RC7/libjpegd/Makefile  2009-01-08 13:58:54.067554853 +0000
@@ -4,7 +4,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -O2 -Wall
+CFLAGS= -O2 -march=nocona -D_GNU_SOURCE -Wall
 
 # macosx universal binary
 # CFLAGS= -O2 -Wall -arch i386 -arch ppc
diff -Naur xephem-3.7.4-RC7ORIG/liblilxml/Makefile xephem-3.7.4-RC7/liblilxml/Makefile
--- xephem-3.7.4-RC7ORIG/liblilxml/Makefile     2009-01-06 12:29:42.723376735 +0000
+++ xephem-3.7.4-RC7/liblilxml/Makefile 2009-01-08 13:58:30.169125884 +0000
@@ -5,7 +5,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -O2 -Wall
+CFLAGS= -O2 -march=nocona -D_GNU_SOURCE -Wall
 
 # macosx universal binary
 # CFLAGS= -O2 -Wall -arch i386 -arch ppc