Skip to content

Commit

Permalink
Merge pull request #166 from olebole/cleanup
Browse files Browse the repository at this point in the history
Cleanup for unneeded and obsolete files
  • Loading branch information
olebole committed Jun 13, 2021
2 parents 441cece + ff25a6d commit ba29a88
Show file tree
Hide file tree
Showing 78 changed files with 19 additions and 10,545 deletions.
101 changes: 4 additions & 97 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export CFLAGS = -g -Wall -O2 $(CARCH)
export LDFLAGS = $(CARCH)
export iraf = $(shell pwd)/

all:: update
all:: sysgen

# Do a full sysgen.
sysgen::
Expand All @@ -19,58 +19,8 @@ sysgen::
(util/mksysgen)
@echo "" ; date ; echo ""

# Update (compile) recent changes.
update::
@echo "Updating the IRAF $(RELEASE) software tree"
@echo "" ; date ; echo ""
(util/mkup)
@echo "" ; date ; echo ""

# Update (compile) with debug libraries.
updatex::
@echo "Updating the IRAF $(RELEASE) software tree"
@echo "" ; date ; echo ""
(util/mkupx)
@echo "" ; date ; echo ""

# Update with cumulative patch of entire system
latest::
@echo "Updating IRAF $(RELEASE) to latest release."
@echo "" ; date ; echo ""
(util/self_update)
(util/iraf_update -all 2>&1 | egrep -v "unexpected end of file")
@echo "" ; date ; echo ""

# Check if system is the latest distributed version
check_latest::
(util/iraf_update -list)

# Update with cumulative patch of core system
latest_src::
@echo "Updating IRAF $(RELEASE) to latest source release."
@echo "" ; date ; echo ""
(util/iraf_update -src)
@echo "" ; date ; echo ""

# Update with cumulative patch of core system
latest_core::
@echo "Updating IRAF $(RELEASE) to core release."
@echo "" ; date ; echo ""
(util/iraf_update -core)
@echo "" ; date ; echo ""


# Update recent changes from the repository.
self_update::
(util/self_update)




# Clean the IRAF tree of all binaries.
src::
(util/mksrc)
pristine::
src pristine::
(util/mksrc)

# Clean the IRAF tree of binaries for the currently configured arch.
Expand All @@ -81,55 +31,12 @@ clean::
noao::
(cd noao ; mkpkg -p noao)

# Summarize the spool files.
summary::
(mkpkg summary)
(chdir noao ; mkpkg -p noao summary)




# ----------------------------------------------------------------------
# architectures
# ----------------------------------------------------------------------
showarch::
(mkpkg arch)
generic::
(util/mkarch generic)

macosx::
(util/mkarch macosx)
macintel::
(util/mkarch macintel)
macos64::
(util/mkarch macos64)
linux::
(util/mkarch linux)
linux64::
(util/mkarch linux64)
freebsd::


# ----------------------------------------------------------------------
# common rules for all Makefiles - do not edit

.c.i:
$(RM) $@
$(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@

.SUFFIXES: .s

.c.s:
$(RM) $@
$(CC) -S $(CFLAGS) $(_NOOP_) $*.c

emptyrule::

cleandir::
(util/mksrc)

distclean:: cleandir

# ----------------------------------------------------------------------
# dependencies generated by makedepend

macosx macintel macos64 linux linux64 freebsd freebsd64 hurd generic::
(util/mkarch $@)
1 change: 0 additions & 1 deletion extern/.patch_release

This file was deleted.

1 change: 0 additions & 1 deletion extern/.release_date

This file was deleted.

1 change: 0 additions & 1 deletion extern/.version

This file was deleted.

1 change: 0 additions & 1 deletion extern/.zzexport

This file was deleted.

11 changes: 0 additions & 11 deletions extern/.zzsetenv.def

This file was deleted.

183 changes: 0 additions & 183 deletions extern/README

This file was deleted.

11 changes: 11 additions & 0 deletions extern/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Dynamic External Package Loading

Dynamic package loading is a new feature in v2.15 that allows for
package directories created in the iraf$extern directory to be
automatically defined when the CL is started. The means that external
package installation no longer *requires* that the hlib$extern.pkg
file be edited to define the package, although that remains an option
for packages which somehow cannot conform to this new scheme.

The option to load external packages from the IRAF repository is
removed, since the repository is not available anymore.
Loading

0 comments on commit ba29a88

Please sign in to comment.