Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 572748 | Differences between
and this patch

Collapse All | Expand All

(-)a/GUI/xephem/Makefile (-16 / +10 lines)
Lines 10-18 Link Here
10
# one executable, xephem.
10
# one executable, xephem.
11
11
12
# These -I and -L flags point to the supporting XEphem libraries
12
# These -I and -L flags point to the supporting XEphem libraries
13
LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
13
LIBINC = -I../../libastro -I../../libip -I../../liblilxml
14
LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
14
LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
15
LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
15
LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
16
16
17
# MOTIFI is the directory containing the Xm directory of include files.
17
# MOTIFI is the directory containing the Xm directory of include files.
18
# MOTIFL is the directory containing the libXm.a library.
18
# MOTIFL is the directory containing the libXm.a library.
Lines 30-41 Link Here
30
endif
30
endif
31
31
32
# for linux and Apple OS X
32
# for linux and Apple OS X
33
CC = gcc
34
CLDFLAGS = -g
35
CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
36
LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
37
XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
33
XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
38
LIBS = $(XLIBS) $(LIBLIB) -lm
34
CFLAGS := $(LIBINC) $(CFLAGS)
35
LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
39
36
40
# static linking on Apple using X11 libs from ports
37
# static linking on Apple using X11 libs from ports
41
# CC = gcc
38
# CC = gcc
Lines 68-76 Link Here
68
# MOTIFI = -I/usr/include
65
# MOTIFI = -I/usr/include
69
# MOTIFL = -L/usr/lib
66
# MOTIFL = -L/usr/lib
70
# CC = cc
67
# CC = cc
71
# CLDFLAGS = 
68
# CLDFLAGS =
72
# CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
69
# CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
73
# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) 
70
# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
74
# XLIBS = -lXm -lXt -lX11
71
# XLIBS = -lXm -lXt -lX11
75
# LIBS = $(XLIBS) $(LIBLIB) -lsocket -lnsl -lc -lm /usr/ucblib/libucb.a
72
# LIBS = $(XLIBS) $(LIBLIB) -lsocket -lnsl -lc -lm /usr/ucblib/libucb.a
76
# Note: if you get regex undefined, add -lgen to the end of LIBS.
73
# Note: if you get regex undefined, add -lgen to the end of LIBS.
Lines 195-206 Link Here
195
	nroff -man $? > $@
192
	nroff -man $? > $@
196
193
197
libs:
194
libs:
198
	cd ../../libastro; make
195
	$(MAKE) -C ../../libastro
199
	cd ../../libip; make
196
	$(MAKE) -C ../../libip
200
	cd ../../libjpegd; make
197
	$(MAKE) -C ../../liblilxml
201
	cd ../../liblilxml; make
202
	cd ../../libpng; make
203
	cd ../../libz; make
204
198
205
clean:
199
clean:
206
	rm -fr *.o ../../lib*/*.[ao]
200
	rm -fr *.o ../../lib*/*.[ao]
(-)a/libastro/Makefile (-5 / +3 lines)
Lines 4-11 Link Here
4
# compiler and flags
4
# compiler and flags
5
5
6
# gcc
6
# gcc
7
CC = gcc
8
CFLAGS= -O2 -Wall
9
7
10
# macosx universal binary
8
# macosx universal binary
11
# CFLAGS= -O2 -Wall -arch i386 -arch ppc
9
# CFLAGS= -O2 -Wall -arch i386 -arch ppc
Lines 83-93 Link Here
83
	vsop87_data.o
81
	vsop87_data.o
84
82
85
libastro.a: $(HS) $(OBJS)
83
libastro.a: $(HS) $(OBJS)
86
	ar rv $@ $(OBJS)
84
	$(AR) rv $@ $(OBJS)
87
	ranlib $@
85
	$(RANLIB) $@
88
86
89
libastro.so: $(HS) $(OBJS)
87
libastro.so: $(HS) $(OBJS)
90
	$(CC) -shared -o $@ $(OBJS)
88
	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
91
89
92
clobber:
90
clobber:
93
	rm -f *.o libastro.a
91
	rm -f *.o libastro.a
(-)a/libip/Makefile (-5 / +4 lines)
Lines 2-9 Link Here
2
# (C) 2001 Elwood Charles Downey
2
# (C) 2001 Elwood Charles Downey
3
3
4
# gcc
4
# gcc
5
CC = gcc
5
CFLAGS += -I../libastro
6
CFLAGS= -I../libastro -O2 -Wall
7
6
8
# macosx universal binary
7
# macosx universal binary
9
# CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
8
# CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
Lines 36-46 Link Here
36
HS = ip.h fsmatch.h
35
HS = ip.h fsmatch.h
37
36
38
libip.a: $(HS)	$(OBJS)
37
libip.a: $(HS)	$(OBJS)
39
	ar rv $@ $(OBJS)
38
	$(AR) rv $@ $(OBJS)
40
	ranlib $@
39
	$(RANLIB) $@
41
40
42
libip.so:    $(OBJS)
41
libip.so:    $(OBJS)
43
	gcc -shared -o $@ $(OBJS)
42
	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
44
43
45
clobber:
44
clobber:
46
	rm -f *.o libip.a
45
	rm -f *.o libip.a
(-)a/liblilxml/Makefile (-4 / +2 lines)
Lines 4-11 Link Here
4
# compiler and flags
4
# compiler and flags
5
5
6
# gcc
6
# gcc
7
CC = gcc
8
CFLAGS= -O2 -Wall
9
7
10
# macosx universal binary
8
# macosx universal binary
11
# CFLAGS= -O2 -Wall -arch i386 -arch ppc
9
# CFLAGS= -O2 -Wall -arch i386 -arch ppc
Lines 27-34 Link Here
27
OBJS = lilxml.o base64.o
25
OBJS = lilxml.o base64.o
28
26
29
liblilxml.a: $(HS) $(OBJS)
27
liblilxml.a: $(HS) $(OBJS)
30
	ar r $@ $(OBJS)
28
	$(AR) r $@ $(OBJS)
31
	ranlib $@
29
	$(RANLIB) $@
32
30
33
liltest: liltest.o liblilxml.a
31
liltest: liltest.o liblilxml.a
34
	$(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
32
	$(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a

Return to bug 572748