projects / packages / atm.git / blame
| Commit | Line | Data |
|---|---|---|
| 6161c0df JR |
1 | diff -urN atm/lib/Makefile atm.shared/lib/Makefile |
| 2 | --- atm/lib/Makefile Fri Jan 21 06:27:10 2000 | |
| 3 | +++ atm.shared/lib/Makefile Sat Jan 13 00:34:04 2001 | |
| 4 | @@ -1,29 +1,61 @@ | |
| 5 | ATM_OBJS=text2atm.o atm2text.o atmequal.o sdu2cell.o text2qos.o qos2text.o \ | |
| 6 | - qosequal.o sap2text.o text2sap.o sapequal.o misc.o | |
| 7 | -ifeq (/usr/lib/libresolv.a,$(wildcard /usr/lib/libresolv.a)) | |
| 8 | -ATM_OBJS += ans_l.o | |
| 9 | -else | |
| 10 | -ATM_OBJS += ans.o | |
| 11 | -endif | |
| 12 | + qosequal.o sap2text.o text2sap.o sapequal.o misc.o ans.o | |
| 13 | +ATM_OBJS_S=text2atm_s.o atm2text_s.o atmequal_s.o sdu2cell_s.o text2qos_s.o qos2text_s.o \ | |
| 14 | + qosequal_s.o sap2text_s.o text2sap_s.o sapequal_s.o misc_s.o ans_s.o | |
| 15 | ATMD_OBJS=common.o diag.o kptr.o text2ip.o timer.o unix.o | |
| 16 | +ATMD_OBJS_S=common_s.o diag_s.o kptr_s.o text2ip_s.o timer_s.o unix_s.o | |
| 17 | PGMS=#test | |
| 18 | GENLIBS=libatm.a libatmd.a | |
| 19 | +SH_VER=`cat $(TOPDIR)/VERSION` | |
| 20 | +SHLIBS=libatm.so.$(SH_VER) libatmd.so.$(SH_VER) | |
| 21 | SYSHDR=atm.h atmd.h atmsap.h | |
| 22 | OPTSYSHDR=stdint.h | |
| 23 | ||
| 24 | -do_all: libatm.a libatmd.a | |
| 25 | +do_all: libatm.a libatmd.a libatm.so libatmd.so | |
| 26 | ||
| 27 | include ../Rules.make | |
| 28 | ||
| 29 | +install: | |
| 30 | + @process() { if [ ! -z "$$3" ]; then mode=$$1; dir=$$2; \ | |
| 31 | + shift 2; echo "install -c -m $$mode $$* $$dir"; \ | |
| 32 | + install -c -m $$mode $$* $$dir || exit 1; fi; }; \ | |
| 33 | + optprocess() { [ -z "$$3" -o -r "/usr/include/$$3" ] || \ | |
| 34 | + process $$*; }; \ | |
| 35 | + $(PROCLIST) | |
| 36 | + @for n in "" $(SUBDIRS); do [ -z "$$n" ] || \ | |
| 37 | + make -C $$n install || exit; done | |
| 38 | + ln -sf libatm.so.$(SH_VER) $(INSTLIB)/libatm.so | |
| 39 | + ln -sf libatmd.so.$(SH_VER) $(INSTLIB)/libatmd.so | |
| 40 | + | |
| 41 | ../lib/libatm.a: libatm.a | |
| 42 | ||
| 43 | +../lib/libatm.so: libatm.so | |
| 44 | + | |
| 45 | +../lib/libatm.so.$(SH_VER): libatm.so.$(SH_VER) | |
| 46 | + | |
| 47 | libatm.a: $(ATM_OBJS) | |
| 48 | ar rcs libatm.a $(ATM_OBJS) | |
| 49 | ||
| 50 | +libatm.so: libatm.so.$(SH_VER) | |
| 51 | + ln -sf libatm.so.$(SH_VER) libatm.so | |
| 52 | + | |
| 53 | +libatm.so.$(SH_VER): $(ATM_OBJS_S) | |
| 54 | + $(CC) -shared -Wl,-soname,libatm.so.$(SH_VER) -o libatm.so.$(SH_VER) $(ATM_OBJS_S) -lresolv | |
| 55 | + | |
| 56 | ../lib/libatmd.a: libatmd.a | |
| 57 | ||
| 58 | +../lib/libatm.so: libatmd.so | |
| 59 | + | |
| 60 | +../lib/libatm.so.$(SH_VER): libatmd.so.$(SH_VER) | |
| 61 | + | |
| 62 | libatmd.a: $(ATMD_OBJS) | |
| 63 | ar rcs libatmd.a $(ATMD_OBJS) | |
| 64 | ||
| 65 | -ans_l.o: ans.o | |
| 66 | - ld -r -o ans_l.o ans.o -L/usr/lib -lresolv | |
| 67 | +libatmd.so: libatmd.so.$(SH_VER) | |
| 68 | + ln -sf libatmd.so.$(SH_VER) libatmd.so | |
| 69 | + | |
| 70 | +libatmd.so.$(SH_VER): $(ATMD_OBJS_S) | |
| 71 | + $(CC) -shared -Wl,-soname,libatmd.so.$(SH_VER) -o libatmd.so.$(SH_VER) $(ATMD_OBJS_S) | |
| 72 | + | |
| 73 | +%_s.o: %.c | |
| 74 | + $(CC) -fPIC -DPIC $(CFLAGS) -c $< -o $@ | |
| 75 | diff -urN atm/lib/timer.c atm.shared/lib/timer.c | |
| 76 | --- atm/lib/timer.c Tue Oct 21 19:00:10 1997 | |
| 77 | +++ atm.shared/lib/timer.c Sat Jan 13 00:27:26 2001 | |
| 78 | @@ -12,6 +12,7 @@ | |
| 79 | ||
| 80 | ||
| 81 | static TIMER *timers = NULL; | |
| 82 | +struct timeval now; | |
| 83 | ||
| 84 | ||
| 85 | static void dump_list(const char *label) | |
| 86 | --- atm/Rules.make~ Sat Jan 13 00:38:31 2001 | |
| 87 | +++ atm/Rules.make Sat Jan 13 00:48:18 2001 | |
| 88 | @@ -81,6 +81,7 @@ | |
| 89 | process 0755 $(INSTSYSBIN) $(SYSPGMS); \ | |
| 90 | process 0755 $(INSTUSRBIN) $(USRPGMS); \ | |
| 91 | process 0644 $(INSTLIB) $(GENLIBS); \ | |
| 92 | + process 0755 $(INSTLIB) $(SHLIBS); \ | |
| 93 | process 0644 $(INSTHDR) $(SYSHDR); \ | |
| 94 | optprocess 0644 $(INSTHDR) $(OPTSYSHDR); \ | |
| 95 | process 0644 $(INSTMAN1) $(MAN1); \ |