OSSP CVS Repository

ossp - Check-in [4143]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 4143
Date: 2001-Jul-04 17:58:13 (local)
2001-Jul-04 15:58:13 (UTC)
User:simons
Branch:
Comment: Make sure libxds.a is built before starting the regression tests.
Tickets:
Inspections:
Files:
ossp-pkg/xds/Makefile      1.6 -> 1.7     15 inserted, 4 deleted

ossp-pkg/xds/Makefile 1.6 -> 1.7

--- Makefile     2001/07/04 15:09:55     1.6
+++ Makefile     2001/07/04 15:58:13     1.7
@@ -2,6 +2,8 @@
 
 CC              = gcc
 CXX             = g++
+AR              = ar
+RANLIB          = ranlib
 
 WARNFLAGS       = -Wall -ansi -pedantic
 OPTFLAGS        = -O3 -pipe
@@ -11,25 +13,34 @@
 CXXFLAGS        =
 LDFLAGS         =
 
+OBJS            = decode.o destroy.o encode.o getbuffer.o init.o register.o \
+                  setbuffer.o unregister.o vdecode.o vencode.o
+
 .c.o:
         $(CC) $(CPPFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(CFLAGS) -c $<
 
 .cpp.o:
         $(CXX) $(CPPFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(CXXFLAGS) -c $<
 
-all:    test xds.3
+all:    libxds.a xds.3 test
+
+libxds.a:       $(OBJS)
+        @rm -f $@
+        $(AR) cr $@ $(OBJS)
+        $(RANLIB) $@
 
-test:           test.o
-        $(CC) $(LDFLAGS) -o $@ test.o
+test:           test.o libxds.a
+        $(CC) $(LDFLAGS) -o $@ test.o -L. -lxds
 
 xds.3:          xds.pod
         pod2man --section=3 --center="XDS Library Programmer API " xds.pod >xds.3
 
 clean::
+        @(cd regression-tests && $(MAKE) clean)
         rm -f test.o test
         rm -f xds.3
 
-check:
+check:          libxds.a
         (cd regression-tests && $(MAKE) check)
 
 # Dependencies

CVSTrac 2.0.1