split of target install into specific ones.

change name of ivy tcl library from ivytcl.* to libtclivy.*
add generation of libtclivy.a

1 files changed, 29 insertions, 18 deletions

diff --git a/src/Makefile b/src/Makefile
index 17ecbe7..b5c8f97 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,12 +17,12 @@
 
 
 MAJOR=3
-MINOR=1
+MINOR=2
 
 XTINC = /usr/X11R6/include
 XTLIB = /usr/X11R6/lib 
 CC=gcc
-CFLAGS =  -g 
+CFLAGS = -g 
 OBJ = ivyloop.o timer.o ivysocket.o ivy.o 
 GOBJ = ivyloop.o timer.o ivysocket.o givy.o
 XTOBJ = ivyxtloop.o ivysocket.o ivy.o
@@ -32,13 +32,11 @@ TARGETS = ivyprobe ivyxtprobe
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c
 
-all: static-libs commands shared-libs tcl-exts
+all: static-libs commands shared-libs
 
-static-libs: libivy.a libgivy.a libxtivy.a
+static-libs: libivy.a libgivy.a libxtivy.a libtclivy.a
 
-shared-libs: libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR) 
-
-tcl-exts: ivytcl.so.$(MAJOR).$(MINOR)
+shared-libs: libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR) libtclivy.so.$(MAJOR).$(MINOR)
 
 commands: $(TARGETS)
 
@@ -66,6 +64,10 @@ libxtivy.a: $(XTOBJ)
 	rm -f $@
 	ar cq $@ $(XTOBJ)
 
+libtclivy.a: $(TCLOBJ)
+	rm -f $@
+	ar cq $@ $(TCLOBJ)
+
 libivy.so.$(MAJOR).$(MINOR): $(OBJ)
 	$(CC) -shared -Wl,-soname,libivy.so.$(MAJOR) -o $@ $(OBJ) -lc
 
@@ -76,31 +78,31 @@ libxtivy.so.$(MAJOR).$(MINOR): $(XTOBJ)
 	$(CC) -shared -Wl,-soname,libxtivy.so.$(MAJOR) -o $@ \
 	$(XTOBJ) -L$(XTLIB) -lXt -lX11 -lc
 
-ivytcl.so.$(MAJOR).$(MINOR): $(TCLOBJ)
-	$(CC) -shared -Wl,-soname,ivytcl.so.$(MAJOR) -o $@ \
+libtclivy.so.$(MAJOR).$(MINOR): $(TCLOBJ)
+	$(CC) -shared -Wl,-soname,libtclivy.so.$(MAJOR) -o $@ \
 	$(TCLOBJ) -L$(TCLLIB) -ltcl -lc
 
 clean:
 	-rm -f $(TARGETS) *.o *.a *.so *.so.* *~
 
-install: all
-	test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin
-	test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin
+installlibs: static-libs shared-libs
 	test -d $(PREFIX)/usr/lib || mkdirhier $(PREFIX)/usr/lib
 	test -d $(PREFIX)/usr/X11R6/lib || mkdirhier $(PREFIX)/usr/X11R6/lib
 	test -d $(PREFIX)/usr/include || mkdirhier $(PREFIX)/usr/include
-	install -m755 ivyprobe $(PREFIX)/usr/bin
-	install -m755 ivyxtprobe $(PREFIX)/usr/X11R6/bin
-
 	install -m644 libivy.a $(PREFIX)/usr/lib
 	install -m644 libgivy.a $(PREFIX)/usr/lib
 	install -m644 libxtivy.a $(PREFIX)/usr/X11R6/lib
+	install -m644 libtclivy.a $(PREFIX)/usr/lib
 
 	install -m644 libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib
 	install -m644 libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib
 	install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib
-	install -m644 ivytcl.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib
-	ln -s /usr/lib/ivytcl.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/ivytcl.so
+	install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib
+
+	install -m644 *.h $(PREFIX)/usr/include
+
+installliblinks: installlibs
+	ln -s /usr/lib/libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libtclivy.so
 	ln -s /usr/lib/libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libivy.so
 	ln -s /usr/lib/libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libivy.so.$(MAJOR)
 	ln -s /usr/lib/libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libgivy.so
@@ -108,7 +110,13 @@ install: all
 	ln -s /usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib/libxtivy.so
 	ln -s /usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib/libxtivy.so.$(MAJOR)
 
-	install -m644 *.h $(PREFIX)/usr/include
+installbins: commands
+	test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin
+	test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin
+	install -m755 ivyprobe $(PREFIX)/usr/bin
+	install -m755 ivyxtprobe $(PREFIX)/usr/X11R6/bin
+
+installdocs:
 	test -d $(PREFIX)/usr/doc/ivy-c || mkdirhier $(PREFIX)/usr/doc/ivy-c
 	for f in `find  ../doc/*.html -type f -maxdepth 1`; do \
                 install -m 644 $$f $(PREFIX)/usr/doc/ivy-c; \
@@ -117,6 +125,9 @@ install: all
 	for f in `find  ../doc/*.1 -type f -maxdepth 1`; do \
                 install -m 644 $$f $(PREFIX)/usr/man/man1; \
         done
+
+install: installlibs installbins installliblinks installdocs
+
 rpm::
 	/usr/bin/rpmize