utils/open2300/patches/x2.patch

   1 --- a/Makefile
   2 +++ b/Makefile
   3 @@ -15,91 +15,91 @@
   4  prefix = /usr/local
   5  exec_prefix = ${prefix}
   6  bindir = ${exec_prefix}/bin
   7 +libdir = ${prefix}/lib
   8
   9  #########################################
  10
  11  CC  = gcc
  12 -OBJ = open2300.o rw2300.o linux2300.o win2300.o
  13 -LOGOBJ = log2300.o rw2300.o linux2300.o win2300.o
  14 -FETCHOBJ = fetch2300.o rw2300.o linux2300.o win2300.o
  15 -WUOBJ = wu2300.o rw2300.o linux2300.o win2300.o
  16 -CWOBJ = cw2300.o rw2300.o linux2300.o win2300.o
  17 -DUMPOBJ = dump2300.o rw2300.o linux2300.o win2300.o
  18 -HISTOBJ = history2300.o rw2300.o linux2300.o win2300.o
  19 -HISTLOGOBJ = histlog2300.o rw2300.o linux2300.o win2300.o
  20 -DUMPBINOBJ = bin2300.o rw2300.o linux2300.o win2300.o
  21 -XMLOBJ = xml2300.o rw2300.o linux2300.o win2300.o
  22 -PGSQLOBJ = pgsql2300.o rw2300.o linux2300.o win2300.o
  23 -LIGHTOBJ = light2300.o rw2300.o linux2300.o win2300.o
  24 -INTERVALOBJ = interval2300.o rw2300.o linux2300.o win2300.o
  25 -MINMAXOBJ = minmax2300.o rw2300.o linux2300.o win2300.o
  26 -MYSQLHISTLOGOBJ = mysqlhistlog2300.o rw2300.o linux2300.o win2300.o
  27 +LIB = lib2300
  28 +LIB_C = rw2300.c linux2300.c
  29 +LIBOBJ = rw2300.o linux2300.o
  30
  31  VERSION = 1.11
  32
  33  CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\"
  34 -CC_LDFLAGS = -lm
  35 -CC_WINFLAG =
  36 -# For Windows - comment the two line above and un-comment the two lines below.
  37 -#CC_LDFLAGS = -lm -lwsock32
  38 -#CC_WINFLAG = -mwindows
  39 +CC_LDFLAGS = -L. -lm -l2300
  40 +LFLAGS = -shared -Wl,-soname
  41  INSTALL = install
  42 +MAKE_EXEC = $(CC) $(CFLAGS) $@.c -o $@ $(CC_LDFLAGS)
  43
  44  ####### Build rules
  45
  46 -all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300
  47 +all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300
  48 +#mysql2300 mysqlhistlog2300
  49
  50 -open2300 : $(OBJ)
  51 -       $(CC) $(CFLAGS) -o $@ $(OBJ) $(CC_LDFLAGS)
  52 -
  53 -dump2300 : $(DUMPOBJ)
  54 -       $(CC) $(CFLAGS) -o $@ $(DUMPOBJ) $(CC_LDFLAGS)
  55 +lib2300 :
  56 +       $(CC) -c -fPIC $(CFLAGS) $(LIB_C)
  57 +       $(CC) $(LFLAGS),$@.so -o $@.so.$(VERSION) $(LIBOBJ)
  58 +       ln -sf $@.so.$(VERSION) $@.so
  59 +
  60 +open2300 : $(LIB)
  61 +       $(MAKE_EXEC)
  62
  63 -log2300 : $(LOGOBJ)
  64 -       $(CC) $(CFLAGS) -o $@ $(LOGOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
  65 +dump2300 : $(LIB)
  66 +       $(MAKE_EXEC)
  67
  68 -fetch2300 : $(FETCHOBJ)
  69 -       $(CC) $(CFLAGS) -o $@ $(FETCHOBJ) $(CC_LDFLAGS)
  70 +log2300 : $(LIB)
  71 +       $(MAKE_EXEC)
  72
  73 -wu2300 : $(WUOBJ)
  74 -       $(CC) $(CFLAGS) -o $@ $(WUOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
  75 +fetch2300 : $(LIB)
  76 +       $(MAKE_EXEC)
  77 +
  78 +srv2300 : $(LIB)
  79 +       $(MAKE_EXEC)
  80 +
  81 +wu2300 : $(LIB)
  82 +       $(MAKE_EXEC)
  83
  84 -cw2300 : $(CWOBJ)
  85 -       $(CC) $(CFLAGS) -o $@ $(CWOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
  86 +cw2300 : $(LIB)
  87 +       $(MAKE_EXEC)
  88
  89 -history2300 : $(HISTOBJ)
  90 -       $(CC) $(CFLAGS) -o $@ $(HISTOBJ) $(CC_LDFLAGS)
  91 +history2300 : $(LIB)
  92 +       $(MAKE_EXEC)
  93
  94 -histlog2300 : $(HISTLOGOBJ)
  95 -       $(CC) $(CFLAGS) -o $@ $(HISTLOGOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
  96 +histlog2300 : $(LIB)
  97 +       $(MAKE_EXEC)
  98
  99 -bin2300 : $(DUMPBINOBJ)
 100 -       $(CC) $(CFLAGS) -o $@ $(DUMPBINOBJ) $(CC_LDFLAGS)
 101 +bin2300 : $(LIB)
 102 +       $(MAKE_EXEC)
 103
 104 -xml2300 : $(XMLOBJ)
 105 -       $(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
 106 +xml2300 : $(LIB)
 107 +       $(MAKE_EXEC)
 108
 109 -mysql2300:
 110 -       $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient
 111 +mysql2300: $(LIB)
 112 +       $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/mysql -L/usr/lib/mysql $(CC_LDFLAGS) -lmysqlclient
 113
 114 -pgsql2300: $(PGSQLOBJ)
 115 -       $(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq
 116 +pgsql2300: $(LIB)
 117 +       $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/pgsql -L/usr/lib/pgsql $(CC_LDFLAGS) -lpq
 118
 119 -light2300: $(LIGHTOBJ)
 120 -       $(CC) $(CFLAGS) -o $@ $(LIGHTOBJ) $(CC_LDFLAGS)
 121 +light2300: $(LIB)
 122 +       $(MAKE_EXEC)
 123
 124 -interval2300: $(INTERVALOBJ)
 125 -       $(CC) $(CFLAGS) -o $@ $(INTERVALOBJ) $(CC_LDFLAGS)
 126 +interval2300: $(LIB)
 127 +       $(MAKE_EXEC)
 128
 129 -minmax2300: $(MINMAXOBJ)
 130 -       $(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
 131 +minmax2300: $(LIB)
 132 +       $(MAKE_EXEC)
 133
 134 -mysqlhistlog2300 :
 135 -       $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient
 136 +mysqlhistlog2300 : $(LIB)
 137 +       $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/mysql -L/usr/lib/mysql $(CC_LDFLAGS) -lmysqlclient
 138
 139
 140  install:
 141         mkdir -p $(bindir)
 142 +       mkdir -p $(libdir)
 143 +       $(INSTALL) $(LIB).so.$(VERSION) $(libdir)
 144 +       ln -sf $(libdir)/$(LIB).so.$(VERSION) $(libdir)/$(LIB).so
 145 +       $(INSTALL) srv2300 $(bindir)
 146         $(INSTALL) open2300 $(bindir)
 147         $(INSTALL) dump2300 $(bindir)
 148         $(INSTALL) log2300 $(bindir)
 149 @@ -111,14 +111,11 @@
 150         $(INSTALL) light2300 $(bindir)
 151         $(INSTALL) interval2300 $(bindir)
 152         $(INSTALL) minmax2300 $(bindir)
 153 -       $(INSTALL) mysql2300 $(bindir)
 154 -       $(INSTALL) mysqlhistlog2300 $(bindir)
 155 +#      $(INSTALL) mysql2300 $(bindir)
 156 +#      $(INSTALL) mysqlhistlog2300 $(bindir)
 157
 158  uninstall:
 159 -       rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300
 160 +       rm -f $(libdir)/$(LIB).* $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300  $(bindir)/fetch2300 $(bindir)/srv2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/histlog2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300
 161
 162  clean:
 163 -       rm -f *~ *.o open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300
 164 -
 165 -cleanexe:
 166 -       rm -f *~ *.o open2300.exe dump2300.exe log2300.exe fetch2300.exe wu2300.exe cw2300.exe history2300.exe histlog2300.exe bin2300.exe xml2300.exe mysql2300.exe pgsql2300.exe light2300.exe interval2300.exe minmax2300.exe
 167 \ No newline at end of file
 168 +       rm -f *~ *.o *.so* open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300