Attachment #384818 for bug #522918

Lines 7-12 Link Here

(-)DoConfig.orig (-1 / +7 lines)
7		7
8	'WIZARD' => 'on',	8	'WIZARD' => 'on',
9	'SHARED' => 'off',	9	'SHARED' => 'off',
		10	'STATIC' => 'on',
10		11
11	);	12	);
12		13
Lines 123-128 Link Here
123		124
124	$MakeVal{'LSTAT'} = '';	125	$MakeVal{'LSTAT'} = '';
125	$MakeVal{'LSHAR'} = '# ';	126	$MakeVal{'LSHAR'} = '# ';
		127	$MakeVal{'SHFLAGS'} = '# ';
126		128
127	} else {	129	} else {
128		130
Lines 136-142 Link Here
136		138
137	$MakeVal{'LSTAT'} = '# ';	139	$MakeVal{'LSTAT'} = '# ';
138	$MakeVal{'LSHAR'} = '';	140	$MakeVal{'LSHAR'} = '';
139		141	if ($MakeFlag{'STATIC'} eq 'on') {
		142	$MakeVal{'SHFLAGS'} = '# ';
		143	} else {
		144	$MakeVal{'SHFLAGS'} = '';
		145	}
140	}	146	}
141		147
142	# special GMP variables	148	# special GMP variables




   my $val;
   my $res;

   system("make \$MAKEOPTS wntl.a");
   RemoveProg($name);
   system("make \$MAKEOPTS $name");

   print "\n*** running $name...";





system("make \$MAKEOPTS InitSettings");

@lines = `./InitSettings`;



print "\n\n*** the wizard is done!!\n\n"; 

system("make \$MAKEOPTS DispSettings");
system("./DispSettings");






# again.

all:
	$(MAKE) setup1
	$(MAKE) setup2
	$(MAKE) setup3
	$(MAKE) setup4
	$(MAKE) ntl.a
	touch all



ntl.a:	$(OBJ) 
@{LSTAT}	$(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT
@{LSTAT}	- $(RANLIB) ntl.a #LSTAT
@{LSHAR}	$(LIBTOOL) --mode=link $(LINK) $(LTOPT) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR

LTOPT=
@{SHFLAGS}LTOPT=-shared
@{LSTAT}LCOMP= #LSTAT
@{LSHAR}LCOMP=$(LIBTOOL) --mode=compile #LSHAR

lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) $(LTOPT) lip.c

ctools.o:	ctools.c
	$(LCOMP) $(COMPILE) $(LTOPT) ctools.c


GetTime.o: GetTime.c 
	$(LCOMP) $(COMPILE) $(LTOPT) GetTime.c



.c.o: 
	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $(LTOPT) $<

.c: 
@{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
@{LSHAR}	$(LIBTOOL) --mode=link $(LINK) $(LTOPT) -o $@ $< libntl.la #LSHAR

#################################################################
#


check:
	sh RemoveProg $(PROGS)
	$(MAKE) QuickTest
	./QuickTest
	sh RemoveProg QuickTest
	sh TestScript

	mkdir -m 755 $(INCLUDEDIR)/NTL
	cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL
	- chmod -R a+r $(INCLUDEDIR)/NTL
	mkdir -p -m 755 $(LIBDIR)
@{LSTAT}	cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT
@{LSTAT}	- chmod a+r $(LIBDIR)/libntl.a #LSTAT
@{LSHAR}	$(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR

install-doc:
	mkdir -p -m 755 $(DOCDIR)
	rm -rf $(DOCDIR)/NTL
	mkdir -m 755 $(DOCDIR)/NTL

	cp -p ../doc/*.html $(DOCDIR)/NTL
	cp -p ../doc/*.gif $(DOCDIR)/NTL
	- chmod -R a+r $(DOCDIR)/NTL
	mkdir -p -m 755 $(LIBDIR)
@{LSTAT}	cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT
@{LSTAT}	- chmod a+r $(LIBDIR)/libntl.a #LSTAT
@{LSHAR}	$(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR


uninstall:
@{LSTAT}	rm -f $(LIBDIR)/libntl.a #LSTAT

Return to bug 522918

Lines 47-55 Link Here

(-)WizardAux.orig (-4 / +4 lines)
47	my $val;	47	my $val;
48	my $res;	48	my $res;
49		49
50	system("make wntl.a");	50	system("make \$MAKEOPTS wntl.a");
51	RemoveProg($name);	51	RemoveProg($name);
52	system("make $name");	52	system("make \$MAKEOPTS $name");
53		53
54	print "\n*** running $name...";	54	print "\n*** running $name...";
55		55
Lines 73-79 Link Here
73		73
74		74
75		75
76	system("make InitSettings");	76	system("make \$MAKEOPTS InitSettings");
77		77
78	@lines = `./InitSettings`;	78	@lines = `./InitSettings`;
79		79
Lines 254-260 Link Here
254		254
255	print "\n\n*** the wizard is done!!\n\n";	255	print "\n\n*** the wizard is done!!\n\n";
256		256
257	system("make DispSettings");	257	system("make \$MAKEOPTS DispSettings");
258	system("./DispSettings");	258	system("./DispSettings");
259		259
260		260

Lines 322-332 Link Here

(-)mfile.orig (-17 / +20 lines)
322	# again.	322	# again.
323		323
324	all:	324	all:
325	make setup1	325	$(MAKE) setup1
326	make setup2	326	$(MAKE) setup2
327	make setup3	327	$(MAKE) setup3
328	make setup4	328	$(MAKE) setup4
329	make ntl.a	329	$(MAKE) ntl.a
330	touch all	330	touch all
331		331
332		332
Lines 361-389 Link Here
361	ntl.a: $(OBJ)	361	ntl.a: $(OBJ)
362	@{LSTAT} $(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT	362	@{LSTAT} $(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT
363	@{LSTAT} - $(RANLIB) ntl.a #LSTAT	363	@{LSTAT} - $(RANLIB) ntl.a #LSTAT
364	@{LSHAR} $(LIBTOOL) --mode=link $(LINK) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR	364	@{LSHAR} $(LIBTOOL) --mode=link $(LINK) $(LTOPT) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR
365		365
		366	LTOPT=
		367	@{SHFLAGS}LTOPT=-shared
366	@{LSTAT}LCOMP= #LSTAT	368	@{LSTAT}LCOMP= #LSTAT
367	@{LSHAR}LCOMP=$(LIBTOOL) --mode=compile #LSHAR	369	@{LSHAR}LCOMP=$(LIBTOOL) --mode=compile #LSHAR
368		370
369	lip.o: lip.c g_lip_impl.h c_lip_impl.h	371	lip.o: lip.c g_lip_impl.h c_lip_impl.h
370	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c	372	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) $(LTOPT) lip.c
371		373
372	ctools.o: ctools.c	374	ctools.o: ctools.c
373	$(LCOMP) $(COMPILE) ctools.c	375	$(LCOMP) $(COMPILE) $(LTOPT) ctools.c
374		376
375		377
376	GetTime.o: GetTime.c	378	GetTime.o: GetTime.c
377	$(LCOMP) $(COMPILE) GetTime.c	379	$(LCOMP) $(COMPILE) $(LTOPT) GetTime.c
378		380
379		381
380		382
381	.c.o:	383	.c.o:
382	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<	384	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $(LTOPT) $<
383		385
384	.c:	386	.c:
385	@{LSTAT} $(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT	387	@{LSTAT} $(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
386	@{LSHAR} $(LIBTOOL) --mode=link $(LINK) -o $@ $< libntl.la #LSHAR	388	@{LSHAR} $(LIBTOOL) --mode=link $(LINK) $(LTOPT) -o $@ $< libntl.la #LSHAR
387		389
388	#################################################################	390	#################################################################
389	#	391	#
Lines 394-400 Link Here
394		396
395	check:	397	check:
396	sh RemoveProg $(PROGS)	398	sh RemoveProg $(PROGS)
397	make QuickTest	399	$(MAKE) QuickTest
398	./QuickTest	400	./QuickTest
399	sh RemoveProg QuickTest	401	sh RemoveProg QuickTest
400	sh TestScript	402	sh TestScript
Lines 421-426 Link Here
421	mkdir -m 755 $(INCLUDEDIR)/NTL	423	mkdir -m 755 $(INCLUDEDIR)/NTL
422	cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL	424	cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL
423	- chmod -R a+r $(INCLUDEDIR)/NTL	425	- chmod -R a+r $(INCLUDEDIR)/NTL
		426	mkdir -p -m 755 $(LIBDIR)
		427	@{LSTAT} cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT
		428	@{LSTAT} - chmod a+r $(LIBDIR)/libntl.a #LSTAT
		429	@{LSHAR} $(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR
		430
		431	install-doc:
424	mkdir -p -m 755 $(DOCDIR)	432	mkdir -p -m 755 $(DOCDIR)
425	rm -rf $(DOCDIR)/NTL	433	rm -rf $(DOCDIR)/NTL
426	mkdir -m 755 $(DOCDIR)/NTL	434	mkdir -m 755 $(DOCDIR)/NTL
Lines 428-438 Link Here
428	cp -p ../doc/*.html $(DOCDIR)/NTL	436	cp -p ../doc/*.html $(DOCDIR)/NTL
429	cp -p ../doc/*.gif $(DOCDIR)/NTL	437	cp -p ../doc/*.gif $(DOCDIR)/NTL
430	- chmod -R a+r $(DOCDIR)/NTL	438	- chmod -R a+r $(DOCDIR)/NTL
431	mkdir -p -m 755 $(LIBDIR)
432	@{LSTAT} cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT
433	@{LSTAT} - chmod a+r $(LIBDIR)/libntl.a #LSTAT
434	@{LSHAR} $(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR
435
436		439
437	uninstall:	440	uninstall:
438	@{LSTAT} rm -f $(LIBDIR)/libntl.a #LSTAT	441	@{LSTAT} rm -f $(LIBDIR)/libntl.a #LSTAT