Attachment #88601 for bug #50209

Lines 1-8 Link Here

(-)xppaut-5.96/Makefile (-18 / +28 lines)
1	# Copyright (C) 1990-2006 Bard Ermentrout	1	# Copyright (C) 1990-2006 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	# End Debian Edit	6	# End Debian Edit
7	#################################	7	#################################
8	#	8	#
Lines 20-26 Link Here
20	##################################	20	##################################
21	# Standard Linux distributions #	21	# Standard Linux distributions #
22	##################################	22	##################################
23	CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include	23	MY_CFLAGS= -DAUTO -DCVODE_YES -DNOERRNO -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
24	#CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include	24	#CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
25	LDFLAGS= -L/usr/X11R6/lib	25	LDFLAGS= -L/usr/X11R6/lib
26	LIBS= -lX11 -lm -ldl	26	LIBS= -lX11 -lm -ldl
Lines 151-156 Link Here
151	menudrive.o userbut.o	151	menudrive.o userbut.o
152	AUTOOBJ = autlib1.o autlib2.o autlib3.o autevd.o run_auto.o autpp.o \	152	AUTOOBJ = autlib1.o autlib2.o autlib3.o autevd.o run_auto.o autpp.o \
153	diagram.o auto_nox.o auto_x11.o flowkm_small.o	153	diagram.o auto_nox.o auto_x11.o flowkm_small.o
		154
		155	.c.o:
		156	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
		157
154	######################################################################	158	######################################################################
155	#	159	#
156	#	160	#
Lines 185-203 Link Here
185	cd mkavi ; make	189	cd mkavi ; make
186	#	190	#
187	# Edited for Debian GNU/Linux.	191	# Edited for Debian GNU/Linux.
188	install: xppaut	192	install: xppaut xppdoc
189	# Make necessary installation directories	193	# Make necessary installation directories
190	mkdir -p $(BINDIR)	194	mkdir -p $(BINDIR)
191	mkdir -p $(DOCDIR)/html	195	mkdir -p $(DOCDIR)/html
192	mkdir -p $(DOCDIR)/examples	196	mkdir -p $(DOCDIR)/examples
193	mkdir -p $(DESTDIR)/usr/X11R6/man/man1	197	mkdir -p $(MANDIR)/man1
194	# Put everything home	198	# Put everything home
195	strip xppaut	199	strip xppaut
196	cp xppaut $(BINDIR)	200	cp xppaut $(BINDIR)
197	cp -r ode* $(DOCDIR)/examples	201	cp -r ode* $(DOCDIR)/examples
198	cp -r help/* $(DOCDIR)/html	202	cp -r help/* $(DOCDIR)/html
199	cp README *.pdf $(DOCDIR)	203	cp README *.pdf $(DOCDIR)
200	cp xppaut.1 $(DESTDIR)/usr/X11R6/man/man1	204	cp xppaut.1 $(MANDIR)/man1
201	# End Debian Ed	205	# End Debian Ed
202	uninstall:	206	uninstall:
203	# Remove everything you created	207	# Remove everything you created
Lines 232-249 Link Here
232	# clean	236	# clean
233	##############################################	237	##############################################
234	clean:	238	clean:
235	rm .o;rm libI77/.o;rm cvodesrc/*.o	239	rm -f .o;rm -f libI77/.o;rm -f cvodesrc/*.o
		240	rm -f .a;rm -f libI77/.a;rm -f cvodesrc/*.a
		241	find . -name \*.ps \| xargs rm
		242	find . -name \*.pdf \| xargs rm
		243	find . -name \*.dvi \| xargs rm
		244	find . -name \*~ \| xargs rm
		245
236	#######################################################	246	#######################################################
237	# Documentation	247	# Documentation
238	#######################################################	248	#######################################################
239	xppdoc:	249	xppdoc:
240	latex xpp_doc	250	latex xpp_doc
241	latex xpp_doc	251	latex xpp_doc
242	latex xpp_doc	252	latex xpp_doc
243	dvips -o xpp_doc.ps xpp_doc	253	dvips -o xpp_doc.ps xpp_doc
244	ps2pdf xpp_doc.ps	254	ps2pdf xpp_doc.ps
245	latex xpp_sum	255	latex xpp_sum
246	latex xpp_sum	256	latex xpp_sum
247	dvips -o xpp_sum.ps xpp_sum	257	dvips -o xpp_sum.ps xpp_sum
248	ps2pdf xpp_sum.ps	258	ps2pdf xpp_sum.ps
249		259

Lines 6-12 Link Here

(-)xppaut-5.96/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

(-)xppaut-5.96/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