Changeset 10312 for trunk/Ohana/src/libtap

Timestamp:

Nov 30, 2006, 9:04:51 AM (20 years ago)

Author:

eugene

Message:

moved tap to tap_ohana, set up to install globally

Location:

trunk/Ohana/src/libtap

Files:

• . (modified) (1 prop)
• .cvsignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• README (modified) (1 diff)
• include (added)
• include/tap_ohana.h (added)
• src/tap_ohana.c (added)

trunk/Ohana/src/libtap

@@ -1 +1 @@
 lib
-include

@@ -1 +1 @@
 lib
-include

trunk/Ohana/src/libtap/.cvsignore

@@ -1 +1 @@
 lib
-include

trunk/Ohana/src/libtap/Makefile

@@ -1 @@
-default: libtap
-install: libtap
+default: install
 help:
-        @echo "make options: libtap (default)"
+        @echo "make options: install libtap clean dist"
 
 include ../../Configure
-
 HOME    =       $(ROOT)/src/libtap
+LIB     =       $(HOME)/lib/$(ARCH)
 LIB     =       $(HOME)/lib/$(ARCH)
 INC     =       $(HOME)/include
 SRC     =       $(HOME)/src
 MAN     =       $(HOME)/doc
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
+include ../../Makefile.Common
 
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH)
+install: $(DESTLIB)/libtap_ohana.a $(DESTLIB)/libtap_ohana.so
+libtap: $(LIB)/libtap_ohana.$(ARCH).a $(LIB)/libtap_ohana.$(ARCH).so
 
-TAP = $(SRC)/tap.$(ARCH).o
+INCS = $(DESTINC)/tap_ohana.h
 
-libtap: $(LIB)/libtap.a
+TAP = $(SRC)/tap_ohana.$(ARCH).o
 
-$(LIB)/libtap.a: $(INC)/tap.h $(TAP)
-        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
-        rm -f $(LIB)/libtap.a
-        ar rcv $(LIB)/libtap.a $(TAP)
-        $(RANLIB) $(LIB)/libtap.a
-
-$(INC)/tap.h: $(SRC)/tap.h
-        @if [ ! -d $(INC) ]; then mkdir -p $(INC); fi
-        echo $@
-        echo $^
-        rm -f $@
-        cp $^ $@
-
-clean:
-        rm -f `find . -name "*.o"`
-        rm -f `find . -name "*.a"`
-        rm -f `find . -name "*~"`
-        rm -f `find . -name "#*"`
-
-dist: clean
-        rm -rf lib
-        rm -rf include
-
-.SUFFIXES: .$(ARCH).o
-
-.c.$(ARCH).o:
-        $(CC) $(CFLAGS) -c $*.c -o $@
+$(TAP): $(INCS)
+$(LIB)/libtap_ohana.$(ARCH).a: $(TAP)
+$(LIB)/libtap_ohana.$(ARCH).so: $(TAP)
 
 # libtap tests are currently not compiled or run

trunk/Ohana/src/libtap/README

@@ -14 +14 @@
 ---
 
+*** Note for Ohana ***
+
 This is a locally modified version of tap to work within the Ohana
 framework.  I have stripped the library down to the source code and
 tests, removed the autogen and libtool stuff, and made a Makefile
-which uses the Ohana $(ARCH) system to install an
-architecture-dependent copy of the library, ARCH/libtap.a.  Unlike
-other Ohana libraries, libtap.a is not installed in a globally visible
-location.  The Ohana test programs which use libtap include a -L to
-the installed version.
-
+which uses the Ohana $(ARCH) system.  The tap library is installed
+with the name tap_ohana (-ltap_ohana, tap_ohana.h).

@@ -1 +1 @@
 lib
-include