diff --git a/.gitignore b/.gitignore index 7715aba4fb75817b861ea31b31ff6350271a2bb0..c064a5cf14a1001e71623baa4e384b3fd54990e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ +*.swp +*.swo .DS_Store build/ -output/ \ No newline at end of file +output/ +RIGAL/rigsc.446/bin/genrigd +RIGAL/rigsc.446/bin/ic +RIGAL/rigsc.446/bin/rc +RIGAL/rigsc.446/bin/v +RIGAL/rigsc.446/bin/anrig +RIGAL/rigsc.446/bin/rig_lint +RIGAL/rigsc.446/lib/riglib.a diff --git a/RIGAL/rigsc.446/bin/genrigd b/RIGAL/rigsc.446/bin/genrigd deleted file mode 100755 index 8bf3de1f73d41ff98b718490c8e4549e55d3fbc0..0000000000000000000000000000000000000000 Binary files a/RIGAL/rigsc.446/bin/genrigd and /dev/null differ diff --git a/RIGAL/rigsc.446/bin/ic b/RIGAL/rigsc.446/bin/ic deleted file mode 100755 index cb9566ee795b3dc311c7666f0491c2cbb1a017a3..0000000000000000000000000000000000000000 Binary files a/RIGAL/rigsc.446/bin/ic and /dev/null differ diff --git a/RIGAL/rigsc.446/bin/rc b/RIGAL/rigsc.446/bin/rc deleted file mode 100755 index 69d5b25289190118f17f0188721a512ebfbce777..0000000000000000000000000000000000000000 Binary files a/RIGAL/rigsc.446/bin/rc and /dev/null differ diff --git a/RIGAL/rigsc.446/bin/v b/RIGAL/rigsc.446/bin/v deleted file mode 100755 index c195549b6dd51df1a9d2740cdc6f677453744e40..0000000000000000000000000000000000000000 Binary files a/RIGAL/rigsc.446/bin/v and /dev/null differ diff --git a/RIGAL/rigsc.446/lib/riglib.a b/RIGAL/rigsc.446/lib/riglib.a deleted file mode 100644 index b562098389230a5958f11e432f0661335b6c139b..0000000000000000000000000000000000000000 Binary files a/RIGAL/rigsc.446/lib/riglib.a and /dev/null differ diff --git a/RIGAL/rigsc.446/src/Makefile b/RIGAL/rigsc.446/src/Makefile index 9a19a6a18e3349c4cff8b14a5f5bfcc118098306..4b0086bdebe9f5f19cc948e48b2f693e2697d9b3 100644 --- a/RIGAL/rigsc.446/src/Makefile +++ b/RIGAL/rigsc.446/src/Makefile @@ -5,9 +5,7 @@ # C compiler to use (Compiler path can be changed by the user) #CCFLAGS = -g -DLE -m32 -I/usr/include -I../include -CCFLAGS = -m32 -I/usr/include -I../include -#PCA = cc $(CCFLAGS) -D STATIC_CCFLAGS='"$(CCFLAGS)"' -c xsun=1 -I../include/ -I/usr/include -PCA = cc $(CCFLAGS) -D STATIC_CCFLAGS='"$(CCFLAGS)"' -c +CCFLAGS = -m32 -I/usr/include -I../include -fcommon # math lib for sin, cos, sqrt etc. LIBS = -lm @@ -44,7 +42,7 @@ normal: bins ../lib/riglib.a ../bin/anrig ../bin/genrigd ../bin/rig_lint test bins: bin ../bin/rc ../bin/ic ../bin/v bin: - -mkdir ../bin + -mkdir -p ../bin #rigal_scratch:# # rm -rf ../rigal_scratch @@ -63,7 +61,7 @@ bin: ../lib/riglib.a:$(CCF_SRC) @echo '*Starting creating library' - -mkdir ../lib + -mkdir -p ../lib -rm -f ../lib/riglib.a ar rv ../lib/riglib.a $(CCF_SRC) -ranlib ../lib/riglib.a @@ -146,8 +144,8 @@ clean: clean_bkups: -rm -rf ../bin_bkup ../lib_bkup ##-------------------------------------- -.c.o: $(INCLIB_SRC) - $(PCA) $< -o $@ +%.o: %.c + $(CC) -c $(CCFLAGS) -D STATIC_CCFLAGS='"$(CCFLAGS)"' -o $@ $< ##---------------------------------------- ## Prepare distribution #mkdist$(RFILE)$(RDIR): diff --git a/RIGAL/rigsc.446/src/rc_.c b/RIGAL/rigsc.446/src/rc_.c index 6ef21cc7df9b1f04a13ab0e4aa385380483253c2..66822abe771073692a6ea5e7a79d3dcea0b36271 100644 --- a/RIGAL/rigsc.446/src/rc_.c +++ b/RIGAL/rigsc.446/src/rc_.c @@ -734,7 +734,7 @@ _L77: fprintf(V.batfile, "$rig/anrig -p N.TMP\n"); fprintf(V.batfile, "$rig/genrigd S -p N.TMP\n"); - fprintf(V.batfile, " cc -g -w -m32 "); + fprintf(V.batfile, " cc -g -w -m32 -fcommon "); for (i = 1; i < an_argc; i++) { strcpy(stt,an_argv[i]); brt(stt);