Skip to content

Commit

Permalink
Remove second copy of cfitsio
Browse files Browse the repository at this point in the history
Since the rule "doppelt hält besser" does not apply to libraries, we
will just remove this secondary link and its references. It was not
built anyway.
  • Loading branch information
olebole committed May 18, 2017
1 parent 9590f45 commit 2d18e9b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 27 deletions.
7 changes: 1 addition & 6 deletions vendor/voclient/common/Makefile
Expand Up @@ -34,7 +34,7 @@ endif
CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./


all:: expat cfitsio curl
all:: expat curl

libs::
(/bin/csh -f mklibs)
Expand All @@ -46,9 +46,6 @@ curl::
expat::
(cd expat ; ./configure --prefix=${HERE}/../; \ make ; make installlib)

cfitsio::
(cd cfitsio ; /bin/csh -f mklibs)

apps:

install:
Expand All @@ -59,12 +56,10 @@ install:
clean:
(if [ "${PLATFORM}" != "Darwin" ]; then (cd curl ; make clean); fi)
(cd expat ; make clean)
(cd cfitsio ; make clean)

distclean:
(if [ "${PLATFORM}" != "Darwin" ]; then (cd curl ; make distclean); fi)
(cd expat ; make distclean)
#(cd cfitsio ; make distclean)



Expand Down
1 change: 0 additions & 1 deletion vendor/voclient/common/cfitsio

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/voclient/common/mklibs
Expand Up @@ -30,29 +30,9 @@ else
endif


set build_cfitsio = 0



echo "Building support libraries ...."
echo " (Using toplevel directory '"$top/"' ....)"

# Global options.
set gopts = "--prefix=$top/ --exec-prefix=$top/ --disable-shared"

#echo " Cleaning files ...."
#./mkclean

if ($build_cfitsio == 1) then
echo " Building CFITSIO libs ...."
(cd cfitsio ; ./mklibs)

else
if ( (! (-e lib/libcfitsio.a)) && (-e ../../bin/libcfitsio.a)) then
ln -s ../../bin/libcfitsio.a lib/libcfitsio.a
endif
endif




Expand Down

0 comments on commit 2d18e9b

Please sign in to comment.