Attachment #30850 for bug #50209

Lines 1-8 Link Here

(-)xpp-orig/Makefile (-9 / +20 lines)
1	# Copyright (C) 1990-2002 Bard Ermentrout	1	# Copyright (C) 1990-2002 Bard Ermentrout
2	# Edited for Debian GNU/Linux.	2	# Edited for Debian GNU/Linux.
3	DESTDIR =	3	#DESTDIR = @destdir@
4	BINDIR = $(DESTDIR)/usr/X11R6/bin	4	#BINDIR = $(DESTDIR)/usr/X11R6/bin
5	DOCDIR = $(DESTDIR)/usr/share/doc/xppaut	5	#DOCDIR = $(DESTDIR)/usr/share/doc/xppaut
		6
6	# End Debian Edit	7	# End Debian Edit
7	#################################	8	#################################
8	#	9	#
Lines 20-26 Link Here
20	##################################	21	##################################
21	# Standard Linux distributions #	22	# Standard Linux distributions #
22	##################################	23	##################################
23	CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include	24	MY_CFLAGS= -DAUTO -DCVODE_YES -DNOERRNO -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
24	LDFLAGS= -L/usr/X11R6/lib	25	LDFLAGS= -L/usr/X11R6/lib
25	LIBS= -lX11 -lm -ldl	26	LIBS= -lX11 -lm -ldl
26	# NOTE: Recent (RedHat 8) versions of GCC seem to no longer have	27	# NOTE: Recent (RedHat 8) versions of GCC seem to no longer have
Lines 142-147 Link Here
142	menudrive.o userbut.o	143	menudrive.o userbut.o
143	AUTOOBJ = autlib1.o autlib2.o autlib3.o autevd.o run_auto.o autpp.o \	144	AUTOOBJ = autlib1.o autlib2.o autlib3.o autevd.o run_auto.o autpp.o \
144	diagram.o auto_nox.o auto_x11.o flowkm_small.o	145	diagram.o auto_nox.o auto_x11.o flowkm_small.o
		146
		147
		148	.c.o:
		149	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
		150
145	######################################################################	151	######################################################################
146	#	152	#
147	#	153	#
Lines 176-194 Link Here
176	cd mkavi ; make	182	cd mkavi ; make
177	#	183	#
178	# Edited for Debian GNU/Linux.	184	# Edited for Debian GNU/Linux.
179	install: xppaut	185	install: xppaut xppdoc
180	# Make necessary installation directories	186	# Make necessary installation directories
181	mkdir -p $(BINDIR)	187	mkdir -p $(BINDIR)
182	mkdir -p $(DOCDIR)/html	188	mkdir -p $(DOCDIR)/html
183	mkdir -p $(DOCDIR)/examples	189	mkdir -p $(DOCDIR)/examples
184	mkdir -p $(DESTDIR)/usr/X11R6/man/man1	190	mkdir -p $(MANDIR)/man1
185	# Put everything home	191	# Put everything home
186	strip xppaut	192	strip xppaut
187	cp xppaut $(BINDIR)	193	cp xppaut $(BINDIR)
188	cp -r ode* $(DOCDIR)/examples	194	cp -r ode* $(DOCDIR)/examples
189	cp -r help/* $(DOCDIR)/html	195	cp -r help/* $(DOCDIR)/html
190	cp README *.pdf $(DOCDIR)	196	cp README *.pdf $(DOCDIR)
191	cp xppaut.1 $(DESTDIR)/usr/X11R6/man/man1	197	cp xppaut.1 $(MANDIR)/man1
192	# End Debian Ed	198	# End Debian Ed
193	uninstall:	199	uninstall:
194	# Remove everything you created	200	# Remove everything you created
Lines 222-228 Link Here
222	# clean	228	# clean
223	##############################################	229	##############################################
224	clean:	230	clean:
225	rm .o;rm libI77/.o;rm cvodesrc/*.o	231	rm -f .o;rm -f libI77/.o;rm -f cvodesrc/*.o
		232	rm -f .a;rm -f libI77/.a;rm -f cvodesrc/*.a
		233	find . -name \*.ps \| xargs rm
		234	find . -name \*.pdf \| xargs rm
		235	find . -name \*.dvi \| xargs rm
		236	find . -name \*~ \| xargs rm
226	#######################################################	237	#######################################################
227	# Documentation	238	# Documentation
228	#######################################################	239	#######################################################
Lines 235-239 Link Here
235	latex xpp_sum	246	latex xpp_sum
236	latex xpp_sum	247	latex xpp_sum
237	dvips -o xpp_sum.ps xpp_sum	248	dvips -o xpp_sum.ps xpp_sum
238	ps2pdf xpp_sum.ps	249	ps2pdf xpp_sum.ps
239		250

Lines 6-12 Link Here

(-)xpp-orig/cvodesrc/Makefile (-2 / +2 lines)
6	# to ranlib from the commands to create lib/libcvode.a.	6	# to ranlib from the commands to create lib/libcvode.a.
7	.SUFFIXES: .c .o	7	.SUFFIXES: .c .o
8	CC = gcc	8	CC = gcc
9	CFLAGS = -O	9	MY_CFLAGS = -fPIC -DPIC
10		10
11	SRCS = cvode.c cvdense.c dense.c cvband.c \	11	SRCS = cvode.c cvdense.c dense.c cvband.c \
12	band.c cvdiag.c cvspgmr.c spgmr.c \	12	band.c cvdiag.c cvspgmr.c spgmr.c \
Lines 17-23 Link Here
17		17
18		18
19	.c.o:	19	.c.o:
20	$(CC) $(CFLAGS) -c $*.c	20	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
21		21
22	lib libcvode.a: $(OBJS)	22	lib libcvode.a: $(OBJS)
23	(ar rcv libcvode.a $(OBJS); ranlib libcvode.a ; cp libcvode.a ../.)	23	(ar rcv libcvode.a $(OBJS); ranlib libcvode.a ; cp libcvode.a ../.)

Lines 8-14 Link Here

(-)xpp-orig/libI77/Makefile (-2 / +2 lines)
8	# wsfe.c:42: structure has no member named `_ptr'	8	# wsfe.c:42: structure has no member named `_ptr'
9	# ...	9	# ...
10	# Then try the following:	10	# Then try the following:
11	CFLAGS = -DSkip_f2c_Undefs -DNON_UNIX_STDIO -O	11	MY_CFLAGS = -fPIC -DPIC -DSkip_f2c_Undefs -DNON_UNIX_STDIO
12	#	12	#
13	# I really don't know what the $!@@**! is going on but it works ...	13	# I really don't know what the $!@@**! is going on but it works ...
14	#	14	#
Lines 18-24 Link Here
18	# this seems to work fine and is much less subject to	18	# this seems to work fine and is much less subject to
19	# screwups	19	# screwups
20	.c.o:	20	.c.o:
21	$(CC) $(CFLAGS) -c $*.c	21	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
22	#	22	#
23	#	23	#
24	# compile, then strip unnecessary symbols	24	# compile, then strip unnecessary symbols

Return to bug 50209