File rpmpackage.diff of Package xephem

Overview Repositories Revisions Requests Users Attributes Meta

File rpmpackage.diff of Package xephem (Revision b1fec3c14ae03d9a6bef81e27a12da3a)

Currently displaying revision b1fec3c14ae03d9a6bef81e27a12da3a , Show latest

diff -ur xephem-4.0.1.orig/GUI/xephem/Makefile xephem-4.0.1/GUI/xephem/Makefile
--- xephem-4.0.1.orig/GUI/xephem/Makefile	2015-08-09 23:36:50.000000000 +0200
+++ xephem-4.0.1/GUI/xephem/Makefile	2021-06-07 18:31:21.948618819 +0200
@@ -10,9 +10,9 @@
 # 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
-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
+LIBINC = -I../../libastro -I../../libip -I../../liblilxml 
+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
 
 # MOTIFI is the directory containing the Xm directory of include files.
 # MOTIFL is the directory containing the libXm.a library.
@@ -32,9 +32,9 @@
 # for linux and Apple OS X
 CC = gcc
 CLDFLAGS = -g
-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
-XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include $(RPM_OPT_FLAGS)
+LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
+XLIBS = -lXm -lxml2 -lXp -lXt -lXext -lXmu -lX11
 LIBS = $(XLIBS) $(LIBLIB) -lm
 
 # static linking on Apple using X11 libs from ports
@@ -197,10 +197,7 @@
 libs:
 	cd ../../libastro; make
 	cd ../../libip; make
-	cd ../../libjpegd; make
 	cd ../../liblilxml; make
-	cd ../../libpng; make
-	cd ../../libz; make
 
 clean:
 	rm -fr *.o ../../lib*/*.[ao]
diff -ur xephem-4.0.1.orig/libastro/Makefile xephem-4.0.1/libastro/Makefile
--- xephem-4.0.1.orig/libastro/Makefile	2006-02-24 04:37:31.000000000 +0100
+++ xephem-4.0.1/libastro/Makefile	2021-06-07 18:32:59.581846892 +0200
@@ -5,7 +5,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -O2 -Wall
+CFLAGS= -O2 -Wall $(RPM_OPT_FLAGS)
 
 # macosx universal binary
 # CFLAGS= -O2 -Wall -arch i386 -arch ppc
diff -ur xephem-4.0.1.orig/libip/Makefile xephem-4.0.1/libip/Makefile
--- xephem-4.0.1.orig/libip/Makefile	2009-01-05 21:53:46.000000000 +0100
+++ xephem-4.0.1/libip/Makefile	2021-06-07 18:33:04.813912703 +0200
@@ -3,7 +3,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -I../libastro -O2 -Wall
+CFLAGS= -I../libastro -O2 -Wall $(RPM_OPT_FLAGS)
 
 # macosx universal binary
 # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
diff -ur xephem-4.0.1.orig/liblilxml/Makefile xephem-4.0.1/liblilxml/Makefile
--- xephem-4.0.1.orig/liblilxml/Makefile	2006-02-24 04:37:32.000000000 +0100
+++ xephem-4.0.1/liblilxml/Makefile	2021-06-07 18:33:08.489958943 +0200
@@ -5,7 +5,7 @@
 
 # gcc
 CC = gcc
-CFLAGS= -O2 -Wall
+CFLAGS= -O2 -Wall $(RPM_OPT_FLAGS)
 
 # macosx universal binary
 # CFLAGS= -O2 -Wall -arch i386 -arch ppc

Places

File rpmpackage.diff of Package xephem (Revision b1fec3c14ae03d9a6bef81e27a12da3a)

Places