fix dependecies

iraf-community · Apr 30, 2017 · 46d8ea4 · 46d8ea4
1 parent b0aa374
commit 46d8ea4
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 146 deletions.
diff --git a/pkg/cl/mkpkg b/pkg/cl/mkpkg
@@ -43,9 +43,9 @@ relink:
 
 	#$set	xflags = "$(xflags) -x"
 	$omake  cl.x
-	$omake	globals.c <libc/libc.h> <libc/stdio.h> <libc/spp.h>\
+	$omake	globals.c <libc/libc.h> <libc/iraf/stdio.h> <libc/spp.h>\
 		construct.h eparam.h operand.h param.h task.h
-	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/stdio.h> config.h\
+	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h> config.h\
 		construct.h errs.h grammar.h mem.h opcodes.h operand.h\
 		param.h task.h
 link:
@@ -61,120 +61,120 @@ libpkg.a:
 	#$set	xflags = "$(xflags) -qx"
 
 	binop.c		<libc/spp.h> <libc/libc.h> <libc/xnames.h>\
-			<libc/math.h> <libc/ctype.h> config.h\
+			<libc/math.h> <libc/iraf/ctype.h> config.h\
 			operand.h errs.h
 
-	bkg.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/knames.h> <libc/xwhen.h> <libc/ctype.h>\
+	bkg.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/knames.h> <libc/xwhen.h> <libc/iraf/ctype.h>\
 			clmodes.h config.h operand.h clmodes.h\
 			mem.h errs.h param.h task.h
 
 	builtin.c	<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/error.h> <libc/ctype.h> <libc/stdio.h>\
+			<libc/error.h> <libc/iraf/ctype.h> <libc/iraf/stdio.h>\
 			<libc/alloc.h> <libc/ttset.h> clmodes.h\
 			config.h mem.h operand.h param.h task.h errs.h
 
-	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h\
 			task.h errs.h
 
-	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h
 
 	compile.c	<libc/spp.h> <libc/libc.h> config.h\
 			operand.h opcodes.h mem.h errs.h
 
-	debug.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	debug.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			operand.h mem.h grammar.h opcodes.h config.h param.h\
 			task.h
 
-	decl.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	decl.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h opcodes.h config.h\
 			param.h task.h errs.h construct.h ytab.h
 
-	edcap.c		<libc/stdio.h> <libc/libc.h> <libc/ctype.h>\
+	edcap.c		<libc/iraf/stdio.h> <libc/libc.h> <libc/iraf/ctype.h>\
 			<libc/fset.h> <libc/spp.h> config.h operand.h\
 			param.h task.h eparam.h
 
-	eparam.c	<libc/stdio.h> <libc/libc.h> <libc/error.h>\
-			<libc/ctype.h> <libc/ttset.h> <libc/fset.h>\
+	eparam.c	<libc/iraf/stdio.h> <libc/libc.h> <libc/error.h>\
+			<libc/iraf/ctype.h> <libc/ttset.h> <libc/fset.h>\
 			<libc/spp.h> config.h mem.h operand.h\
 			errs.h param.h grammar.h task.h eparam.h
 
 	errs.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/stdio.h> <libc/setjmp.h> <libc/knames.h>\
+			<libc/iraf/stdio.h> <libc/knames.h>\
 			<libc/xnames.h> clmodes.h\
 			config.h operand.h param.h task.h mem.h errs.h\
 			grammar.h construct.h
 
-	exec.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	exec.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xwhen.h> clmodes.h config.h mem.h\
 			opcodes.h operand.h param.h task.h errs.h\
 			grammar.h
 
-	gquery.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gquery.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h clmodes.h
 
-	gram.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gram.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h\
 			opcodes.h config.h param.h task.h errs.h construct.h\
 			ytab.h
 
-	history.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/fset.h> <libc/ctype.h> config.h errs.h\
+	history.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/fset.h> <libc/iraf/ctype.h> config.h errs.h\
 			mem.h operand.h param.h task.h clmodes.h grammar.h
 
-	lists.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	lists.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h mem.h operand.h param.h\
 			task.h errs.h
 
 	main.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/main.h> <libc/stdio.h> <libc/error.h>\
-			<libc/setjmp.h> <libc/knames.h> <libc/prtype.h>\
+			<libc/main.h> <libc/iraf/stdio.h> <libc/error.h>\
+			<libc/knames.h> <libc/prtype.h>\
 			<libc/xwhen.h> <libc/xnames.h> grammar.h\
 			opcodes.h operand.h param.h config.h clmodes.h task.h\
 			errs.h mem.h
 
 	modes.c		<libc/spp.h> <libc/libc.h>\
-			<libc/stdio.h> <libc/ctype.h> clmodes.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> clmodes.h\
 			config.h construct.h operand.h param.h grammar.h\
 			mem.h task.h errs.h
 
-	operand.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	operand.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h config.h operand.h param.h grammar.h\
 			mem.h task.h construct.h eparam.h
 
-	param.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	param.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h mem.h\
 			task.h errs.h clmodes.h construct.h
 
 	pfiles.c	<libc/spp.h> <libc/libc.h> <libc/finfo.h>\
-			<libc/stdio.h> <libc/ctype.h> config.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> config.h\
 			errs.h operand.h mem.h param.h task.h grammar.h
 
-	prcache.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	prcache.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/error.h> <libc/finfo.h> <libc/prstat.h>\
 			config.h errs.h task.h
 
-	scan.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	scan.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h errs.h
 
-	stack.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	stack.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			mem.h operand.h config.h param.h task.h\
 			errs.h
 
-	task.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	task.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h mem.h task.h\
 			errs.h clmodes.h
 
-	unop.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	unop.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h> <libc/math.h> config.h\
 			operand.h errs.h task.h param.h
 
-	ytab.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/ctype.h> config.h mem.h operand.h\
+	ytab.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/iraf/ctype.h> config.h mem.h operand.h\
 			param.h grammar.h opcodes.h clmodes.h task.h\
 			construct.h errs.h lexyy.c lexicon.c
 	;
diff --git a/pkg/ecl/mkpkg b/pkg/ecl/mkpkg
@@ -54,39 +54,30 @@ relink:
 
 	$ifeq (MACH, sparc) then
 	    $set    XFLAGS          = "$(XFLAGS) -/DNO_READLINE"
-<<<<<<< HEAD
-=======
 	$else  $ifneq (MACH, linux, linux64) then
 	    $call	libs@readline
         $endif
->>>>>>> 7b0ad9d... remove readline
 	$endif
 
 	$update libpkg.a
 
 	#$set	xflags = "$(xflags) -x -/DYYDEBUG"
 	$set	xflags = "$(xflags) -x"
 	$omake  ecl.x
-	$omake	globals.c <libc/libc.h> <libc/stdio.h> <libc/spp.h>\
+	$omake	globals.c <libc/libc.h> <libc/iraf/stdio.h> <libc/spp.h>\
 		construct.h eparam.h operand.h param.h task.h
-	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/stdio.h> config.h\
+	$omake	opcodes.c <libc/libc.h> <libc/spp.h> <libc/iraf/stdio.h> config.h\
 		construct.h errs.h grammar.h mem.h opcodes.h operand.h\
 		param.h task.h
 link:
 	$set	LIBS = "-lc -lcur -lds -lstg"
 	$ifneq (MACH, sparc) then
 	  $ifeq (MACH, linux) then
-<<<<<<< HEAD
-	    $set	LIBS2 = "-/L/usr/lib32 -lreadline -lncurses"
-	  $else
-	    $set	LIBS2 = "-lreadline -lncurses"
-=======
 	    $set	LIBS2 = "-lreadline -/L/usr/lib32 -lncurses"
 	  $else $ifeq (MACH, linux64) then
 	    $set	LIBS2 = "-lreadline -lncurses"
     	  $else
 	    $set	LIBS2 = "libreadline.a -lncurses"
->>>>>>> 7b0ad9d... remove readline
 	  $endif
 	  $endif
 	$else
@@ -104,120 +95,120 @@ libpkg.a:
 	$set	xflags = "$(xflags) -qx"
 
 	binop.c		<libc/spp.h> <libc/libc.h> <libc/xnames.h>\
-			<libc/math.h> <libc/ctype.h> config.h\
+			<libc/math.h> <libc/iraf/ctype.h> config.h\
 			operand.h errs.h
 
-	bkg.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/knames.h> <libc/xwhen.h> <libc/ctype.h>\
+	bkg.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/knames.h> <libc/xwhen.h> <libc/iraf/ctype.h>\
 			clmodes.h config.h operand.h clmodes.h\
 			mem.h errs.h param.h task.h
 
 	builtin.c	<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/error.h> <libc/ctype.h> <libc/stdio.h>\
+			<libc/error.h> <libc/iraf/ctype.h> <libc/iraf/stdio.h>\
 			<libc/alloc.h> <libc/ttset.h> clmodes.h\
 			config.h mem.h operand.h param.h task.h errs.h
 
-	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clprintf.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h\
 			task.h errs.h
 
-	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	clsystem.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h
 
 	compile.c	<libc/spp.h> <libc/libc.h> config.h\
 			operand.h opcodes.h mem.h errs.h
 
-	debug.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	debug.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			operand.h mem.h grammar.h opcodes.h config.h param.h\
 			task.h
 
-	decl.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	decl.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h opcodes.h config.h\
 			param.h task.h errs.h construct.h ytab.h
 
-	edcap.c		<libc/stdio.h> <libc/libc.h> <libc/ctype.h>\
+	edcap.c		<libc/iraf/stdio.h> <libc/libc.h> <libc/iraf/ctype.h>\
 			<libc/fset.h> <libc/spp.h> config.h operand.h\
 			param.h task.h eparam.h
 
-	eparam.c	<libc/stdio.h> <libc/libc.h> <libc/error.h>\
-			<libc/ctype.h> <libc/ttset.h> <libc/fset.h>\
+	eparam.c	<libc/iraf/stdio.h> <libc/libc.h> <libc/error.h>\
+			<libc/iraf/ctype.h> <libc/ttset.h> <libc/fset.h>\
 			<libc/spp.h> config.h mem.h operand.h\
 			errs.h param.h grammar.h task.h eparam.h
 
 	errs.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/stdio.h> <libc/setjmp.h> <libc/knames.h>\
+			<libc/iraf/stdio.h> <libc/knames.h>\
 			<libc/xnames.h> clmodes.h\
 			config.h operand.h param.h task.h mem.h errs.h\
 			grammar.h construct.h
 
-	exec.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	exec.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xwhen.h> clmodes.h config.h mem.h\
 			opcodes.h operand.h param.h task.h errs.h\
 			grammar.h
 
-	gquery.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gquery.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h clmodes.h
 
-	gram.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	gram.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			clmodes.h operand.h mem.h grammar.h\
 			opcodes.h config.h param.h task.h errs.h construct.h\
 			ytab.h
 
-	history.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/fset.h> <libc/ctype.h> config.h errs.h\
+	history.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/fset.h> <libc/iraf/ctype.h> config.h errs.h\
 			mem.h operand.h param.h task.h clmodes.h grammar.h
 
-	lists.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	lists.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h mem.h operand.h param.h\
 			task.h errs.h
 
 	main.c		<libc/spp.h> <libc/libc.h> <libc/fset.h>\
-			<libc/main.h> <libc/stdio.h> <libc/error.h>\
-			<libc/setjmp.h> <libc/knames.h> <libc/prtype.h>\
+			<libc/main.h> <libc/iraf/stdio.h> <libc/error.h>\
+			<libc/knames.h> <libc/prtype.h>\
 			<libc/xwhen.h> <libc/xnames.h> grammar.h\
 			opcodes.h operand.h param.h config.h clmodes.h task.h\
 			errs.h mem.h
 
 	modes.c		<libc/spp.h> <libc/libc.h>\
-			<libc/stdio.h> <libc/ctype.h> clmodes.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> clmodes.h\
 			config.h construct.h operand.h param.h grammar.h\
 			mem.h task.h errs.h
 
-	operand.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	operand.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			errs.h config.h operand.h param.h grammar.h\
 			mem.h task.h construct.h eparam.h
 
-	param.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	param.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h mem.h\
 			task.h errs.h clmodes.h construct.h
 
 	pfiles.c	<libc/spp.h> <libc/libc.h> <libc/finfo.h>\
-			<libc/stdio.h> <libc/ctype.h> config.h\
+			<libc/iraf/stdio.h> <libc/iraf/ctype.h> config.h\
 			errs.h operand.h mem.h param.h task.h grammar.h
 
-	prcache.c	<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	prcache.c	<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/error.h> <libc/finfo.h> <libc/prstat.h>\
 			config.h errs.h task.h
 
-	scan.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	scan.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h grammar.h\
 			task.h errs.h
 
-	stack.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	stack.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			mem.h operand.h config.h param.h task.h\
 			errs.h
 
-	task.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	task.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			config.h operand.h param.h mem.h task.h\
 			errs.h clmodes.h
 
-	unop.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
+	unop.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
 			<libc/xnames.h> <libc/math.h> config.h\
 			operand.h errs.h task.h param.h
 
-	ytab.c		<libc/spp.h> <libc/libc.h> <libc/stdio.h>\
-			<libc/ctype.h> config.h mem.h operand.h\
+	ytab.c		<libc/spp.h> <libc/libc.h> <libc/iraf/stdio.h>\
+			<libc/iraf/ctype.h> config.h mem.h operand.h\
 			param.h grammar.h opcodes.h clmodes.h task.h\
 			construct.h errs.h lexyy.c lexicon.c
 	;