DtSearch: get it to build, fix up some confusion
authorJon Trulson <jon@radscan.com>
Sat, 26 Oct 2019 20:13:19 +0000 (14:13 -0600)
committerJon Trulson <jon@radscan.com>
Sat, 26 Oct 2019 20:13:19 +0000 (14:13 -0600)
There are/were two dproto.h files, one in DtSearch, one in raima.  The
one in raima is the one we want, so replace the global Dt/dproto.h
with it.  Also correct a prototype declaration error in that file.

Delete the dproto.h file in DtSearch, it's garbage and unused.

Next, redo the way yacc is used.  Autotools does "the right thing" by
simply including the .y file in *_SOURCES and using
BUILT_SOURCES/CLEANFILES to manage it.  No need for special rules to
handle yacc and lex.

cde/include/Dt/dproto.h
cde/lib/DtSearch/Makefile.am
cde/lib/DtSearch/raima/Makefile.am
cde/lib/DtSearch/raima/dproto.h [deleted file]

index e0fd45305a926c0a60f01a5544857cbb8e94fad2..2baa462f79e4d614de2ec13da30bae4e5fa958ea 100644 (file)
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
-/* $XConsortium: dproto.h /main/2 1996/05/09 03:55:20 drk $ */
+/* $XConsortium: dproto.h /main/2 1996/05/09 04:05:13 drk $ */
+/*
+ *   COMPONENT_NAME: austext
+ *
+ *   FUNCTIONS: Pi
+ *             d_alloc
+ *             d_calloc
+ *             d_cmstat
+ *             d_cmtype
+ *             d_connect
+ *             d_costat
+ *             d_cotype
+ *             d_crget
+ *             d_crread
+ *             d_crset
+ *             d_crtype
+ *             d_crwrite
+ *             d_csmget
+ *             d_csmread
+ *             d_csmset
+ *             d_csmwrite
+ *             d_csoget
+ *             d_csoread
+ *             d_csoset
+ *             d_csowrite
+ *             d_csstat
+ *             d_ctbpath
+ *             d_ctscm
+ *             d_ctsco
+ *             d_ctscr
+ *             d_dbdpath
+ *             d_dbfpath
+ *             d_dblog
+ *             d_dbtaf
+ *             d_dbuserid
+ *             d_decode_dba
+ *             d_destroy
+ *             d_discon
+ *             d_encode_dba
+ *             d_fillnew
+ *             d_findco
+ *             d_findfm
+ *             d_findlm
+ *             d_findnm
+ *             d_findpm
+ *             d_free
+ *             d_gtscm
+ *             d_gtsco
+ *             d_gtscr
+ *             d_gtscs
+ *             d_initfile
+ *             d_ismember
+ *             d_isowner
+ *             d_keydel
+ *             d_keyexist
+ *             d_keyfind
+ *             d_keyfree
+ *             d_keyfrst
+ *             d_keylast
+ *             d_keylock
+ *             d_keylstat
+ *             d_keynext
+ *             d_keyprev
+ *             d_keyread
+ *             d_keystore
+ *             d_lock
+ *             d_makenew
+ *             d_mapchar
+ *             d_members
+ *             d_memlock
+ *             d_memlock_group
+ *             d_memunlock
+ *             d_memunlock_group
+ *             d_off_opt
+ *             d_on_opt
+ *             d_open
+ *             d_rdcurr
+ *             d_recfree
+ *             d_recfrst
+ *             d_reclast
+ *             d_reclock
+ *             d_reclstat
+ *             d_recover
+ *             d_recread
+ *             d_recset
+ *             d_recstat
+ *             d_recwrite
+ *             d_renfile
+ *             d_rerdcurr
+ *             d_retries
+ *             d_set_dberr
+ *             d_setdb
+ *             d_setfiles
+ *             d_setfree
+ *             d_setkey
+ *             d_setlock
+ *             d_setlstat
+ *             d_setmm
+ *             d_setmo
+ *             d_setmr
+ *             d_setom
+ *             d_setoo
+ *             d_setor
+ *             d_setpages
+ *             d_setrm
+ *             d_setro
+ *             d_stscm
+ *             d_stsco
+ *             d_stscr
+ *             d_stscs
+ *             d_timeout
+ *             d_trbegin
+ *             d_trlog
+ *             d_utscm
+ *             d_utsco
+ *             d_utscr
+ *             d_utscs
+ *             d_wrcurr
+ *             dberr
+ *             dt_closetask
+ *             dt_opentask
+ *
+ *   ORIGINS: 157
+ *
+ */
 /*----------------------------------------------------------------------------
    dproto.h: db_VISTA (user) function declaration header file
 
 */
 
 
-int d_setfiles(P1(int));                               /* dio.c */
-int d_setpages(P1(int) Pi(int));                       /* dio.c */
-int d_trbound(P0);                             /* trlog.c */
-int d_trlog(P1(int) Pi(int) Pi(CONST char FAR *) Pi(int)); 
+int d_setfiles(int);                           /* dio.c */
+int d_setpages(int, int);                      /* dio.c */
+int d_trbound(void);                           /* trlog.c */
+int d_trlog(int, int, const char *, int); 
                                                                /* trlog.c */
-int d_trmark(P0);                              /* trlog.c */
-int d_tron(P0);                                        /* trlog.c */
-int d_troff(P0);                                       /* trlog.c */
-int d_decode_dba(P1(DB_ADDR) Pi(int FAR *) Pi(long FAR *)); 
+int d_trmark(void);                            /* trlog.c */
+int d_tron(void);                                      /* trlog.c */
+int d_troff(void);                                     /* trlog.c */
+int d_decode_dba(DB_ADDR, int *, long *); 
                                                                /* dbacode.c */
-int d_encode_dba(P1(int) Pi(long) Pi(DB_ADDR FAR *)); 
+int d_encode_dba(int, long, DB_ADDR *); 
                                                                /* dbacode.c */
 
 #define d_memlock(p)           /**/
 #define d_memlock_group(lg)    S_OKAY
 #define d_memunlock(p)         /**/
 #define d_memunlock_group(lg)  /**/
-char FAR * d_alloc(P1(unsigned));              /* alloc.c */
-char FAR * d_calloc(P1(unsigned) Pi(unsigned));        /* alloc.c */
-void d_free(P1(CHAR_P FAR *));                 /* alloc.c */
+char * d_alloc(unsigned);              /* alloc.c */
+char * d_calloc(unsigned, unsigned);   /* alloc.c */
+void d_free(CHAR_P *);                 /* alloc.c */
 
-#ifndef MULTI_TASK                     /* MULTI_TASK */
 #define dt_opentask(a) S_OKAY
 #define dt_closetask(a) S_OKAY
 
-int d_close(P0);                                       /* dblfcns.c */
-int d_cmstat(P1(int) DBN_Dn);                  /* cmstat.c */
-int d_cmtype(P1(int) Pi(int FAR *) DBN_Dn);    /* cmtype.c */
-int d_connect(P1(int) DBN_Dn);                 /* connect.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_costat(P1(int) DBN_Dn);                  /* costat.c */
-#endif                                    /* NO_TIMESTAMP */
-int d_cotype(P1(int) Pi(int FAR *) DBN_Dn);    /* cotype.c */
-int d_crget(P1(DB_ADDR FAR *) DBN_Dn);         /* crget.c */
-int d_crread(P1(long) Pi(char FAR *) DBN_Dn);  /* crread.c */
-int d_crset(P1(DB_ADDR FAR *) DBN_Dn);         /* crset.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_crstat(P0);                              /* crstat.c */
-#endif                                    /* NO_TIMESTAMP */
-int d_crtype(P1(int FAR *) DBN_Dn);            /* crtype.c */
-int d_crwrite(P1(long) Pi(char FAR *) DBN_Dn);         /* crwrite.c */
-int d_csmget(P1(int) Pi(DB_ADDR FAR *) DBN_Dn);        /* csmget.c */
-int d_csmread(P1(int) Pi(long) Pi(char FAR *) DBN_Dn); 
+int d_close(void);                                     /* dblfcns.c */
+int d_cmstat(int, int);                        /* cmstat.c */
+int d_cmtype(int, int *, int);         /* cmtype.c */
+int d_connect(int, int);                       /* connect.c */
+int d_cotype(int, int *, int);         /* cotype.c */
+int d_crget(DB_ADDR *, int);           /* crget.c */
+int d_crread(long, char *, int);       /* crread.c */
+int d_crset(DB_ADDR *, int);           /* crset.c */
+int d_crtype(int *, int);              /* crtype.c */
+int d_crwrite(long, char *, int);      /* crwrite.c */
+int d_csmget(int, DB_ADDR *, int);     /* csmget.c */
+int d_csmread(int, long, char *, int); 
                                                                /* csmread.c */
-int d_csmset(P1(int) Pi(DB_ADDR FAR *) DBN_Dn);        /* csmset.c */
-int d_csmwrite(P1(int) Pi(long) Pi(CONST char FAR *) DBN_Dn); 
+int d_csmset(int, DB_ADDR *, int);     /* csmset.c */
+int d_csmwrite(int, long, const char *, int); 
                                                                /* csmwrite.c */
-int d_csoget(P1(int) Pi(DB_ADDR FAR *) DBN_Dn);        /* csoget.c */
-int d_csoread(P1(int) Pi(long) Pi(char FAR *) DBN_Dn); 
+int d_csoget(int, DB_ADDR *, int);     /* csoget.c */
+int d_csoread(int, long, char *, int); 
                                                                /* csoread.c */
-int d_csoset(P1(int) Pi(DB_ADDR FAR *) DBN_Dn);        /* csoset.c */
-int d_csowrite(P1(int) Pi(long) Pi(CONST char FAR *) DBN_Dn); 
+int d_csoset(int, DB_ADDR *, int);     /* csoset.c */
+int d_csowrite(int, long, const char *, int); 
                                                                /* csowrite.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_csstat(P1(int) DBN_Dn);                  /* csstat.c */
-int d_ctscm(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* ctscm.c */
-int d_ctsco(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* ctsco.c */
-int d_ctscr(P1(ULONG FAR *));                  /* ctscr.c */
-#endif                                    /* NO_TIMESTAMP */
-#ifndef NO_COUNTRY
-int d_ctbpath(P1(CONST char FAR *));           /* pathfcns.c */
-#endif                                    /* NO_COUNTRY */
-int d_dbdpath(P1(CONST char FAR *));           /* dbdpath.c */
-int d_dbfpath(P1(CONST char FAR *));           /* dbfpath.c */
-int d_dblog(P1(CONST char FAR *));             /* dblog.c */
-int d_dbtaf(P1(CONST char FAR *));             /* dbtaf.c */
-int d_dbuserid(P1(CONST char FAR *));          /* dbuserid.c */
-int d_delete(DBN_D1);                          /* delete.c */
-int d_disdel(DBN_D1);                          /* disdel.c */
-int d_recnext(DBN_D1);                         /* recnext.c */
-int d_recprev(DBN_D1);                         /* recprev.c */
-int d_destroy(P1(CONST char FAR *));           /* destroy.c */
-int d_discon(P1(int) DBN_Dn);                  /* discon.c */
-int d_fillnew(P1(int) Pi(CONST char FAR *) DBN_Dn); /* fillnew.c */
-int d_findco(P1(int) DBN_Dn);                  /* findco.c */
-int d_findfm(P1(int) DBN_Dn);                  /* findfm.c */
-int d_findlm(P1(int) DBN_Dn);                  /* findlm.c */
-int d_findnm(P1(int) DBN_Dn);                  /* findnm.c */
-int d_findpm(P1(int) DBN_Dn);                  /* findpm.c */
-int d_freeall(P0);                             /* dblfcns.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_gtscm(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* gtscm.c */
-int d_gtsco(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* gtsco.c */
-int d_gtscr(P1(ULONG FAR *));                  /* gtscr.c */
-int d_gtscs(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* gtscs.c */
-#endif                                    /* NO_TIMESTAMP */
-int d_initialize(DBN_D1);                              /* initial.c */
-int d_initfile(P1(FILE_NO) DBN_Dn);            /* initial.c */
-int d_ismember(P1(int) DBN_Dn);                        /* ismember.c */
-int d_isowner(P1(int) DBN_Dn);                 /* isowner.c */
-int d_keydel(P1(long) DBN_Dn);                 /* keydel.c */
-int d_keyexist(P1(long) DBN_Dn);                       /* keyexist.c */
-int d_keyfind(P1(long) Pi(CONST char FAR *) DBN_Dn); 
+int d_ctbpath(const char *);           /* pathfcns.c */
+int d_dbdpath(const char *);           /* dbdpath.c */
+int d_dbfpath(const char *);           /* dbfpath.c */
+int d_dblog(const char *);             /* dblog.c */
+int d_dbtaf(const char *);             /* dbtaf.c */
+int d_dbuserid(const char *);          /* dbuserid.c */
+int d_delete(int);                             /* delete.c */
+int d_disdel(int);                             /* disdel.c */
+int d_recnext(int);                            /* recnext.c */
+int d_recprev(int);                            /* recprev.c */
+int d_destroy(const char *);           /* destroy.c */
+int d_discon(int, int);                        /* discon.c */
+int d_fillnew(int, const char *, int); /* fillnew.c */
+int d_findco(int, int);                        /* findco.c */
+int d_findfm(int, int);                        /* findfm.c */
+int d_findlm(int, int);                        /* findlm.c */
+int d_findnm(int, int);                        /* findnm.c */
+int d_findpm(int, int);                        /* findpm.c */
+int d_freeall(void);                           /* dblfcns.c */
+int d_initialize(int);                         /* initial.c */
+int d_initfile(FILE_NO, int);                  /* initial.c */
+int d_ismember(int, int);                      /* ismember.c */
+int d_isowner(int, int);                       /* isowner.c */
+int d_keydel(long, int);                       /* keydel.c */
+int d_keyexist(long, int);                     /* keyexist.c */
+int d_keyfind(long, const char *, int); 
                                                                /* keyfind.c */
-int d_keyfree(P1(long) DBN_Dn);                        /* dblfcns.c */
-int d_keyfrst(P1(long) DBN_Dn);                        /* keyfrst.c */
-int d_keylast(P1(long) DBN_Dn);                        /* keylast.c */
-int d_keylock(P1(long) Pi(char FAR *) DBN_Dn);         /* dblfcns.c */
-int d_keylstat(P1(long) Pi(char FAR *) DBN_Dn);        /* dblfcns.c */
-int d_keynext(P1(long) DBN_Dn);                        /* keynext.c */
-int d_keyprev(P1(long) DBN_Dn);                        /* keyprev.c */
-int d_keyread(P1(char FAR *));                 /* keyfcns.c */
-int d_keystore(P1(long) DBN_Dn);                       /* keystore.c */
-int d_lock(P1(int) Pi(LOCK_REQUEST FAR *) DBN_Dn); /* dblfcns.c */
-int d_makenew(P1(int) DBN_Dn);                 /* makenew.c */
-int d_mapchar(P1(unsigned char) Pi(unsigned char) 
-                     Pi(CONST char FAR *) Pi(unsigned char));  /* mapchar.c */
-int d_members(P1(int) Pi(LONG FAR *) DBN_Dn);  /* members.c */
-int d_off_opt(P1(int));                                /* options.c */
-int d_on_opt(P1(int));                         /* options.c */
-int d_open(P1(CONST char FAR *) Pi(CONST char FAR *)); 
+int d_keyfree(long, int);                      /* dblfcns.c */
+int d_keyfrst(long, int);                      /* keyfrst.c */
+int d_keylast(long, int);                      /* keylast.c */
+int d_keylock(long, char *, int);      /* dblfcns.c */
+int d_keylstat(long, char *, int);     /* dblfcns.c */
+int d_keynext(long, int);                      /* keynext.c */
+int d_keyprev(long, int);                      /* keyprev.c */
+int d_keyread(char *);                 /* keyfcns.c */
+int d_keystore(long, int);                     /* keystore.c */
+int d_lock(int, LOCK_REQUEST *, int); /* dblfcns.c */
+int d_makenew(int, int);                       /* makenew.c */
+int d_mapchar(unsigned char, unsigned char, const char *, unsigned char);  /* mapchar.c */
+int d_members(int, LONG *, int);       /* members.c */
+int d_off_opt(int);                            /* options.c */
+int d_on_opt(int);                             /* options.c */
+int d_open(const char *, const char *); 
                                                                /* dblfcns.c */
-int d_rerdcurr(P1(DB_ADDR FAR **));            /* rwcurr.c */
-int d_rdcurr(P1(DB_ADDR FAR **) Pi(int FAR *));        /* rwcurr.c */
-int d_wrcurr(P1(DB_ADDR FAR *));                       /* rwcurr.c */
-int d_recfree(P1(int) DBN_Dn);                 /* dblfcns.c */
-int d_recfrst(P1(int) DBN_Dn);                 /* recfrst.c */
-int d_reclast(P1(int) DBN_Dn);                 /* reclast.c */
-int d_reclock(P1(int) Pi(char FAR *) DBN_Dn);  /* dblfcns.c */
-int d_reclstat(P1(int) Pi(char FAR *) DBN_Dn);         /* dblfcns.c */
-int d_recover(P1(CONST char FAR *));           /* recover.c */
-int d_recread(P1(char FAR *) DBN_Dn);          /* recread.c */
-int d_recset(P1(int) DBN_Dn);                          /* recset.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_recstat(P1(DB_ADDR) Pi(ULONG));          /* recstat.c */
-#endif                                    /* NO_TIMESTAMP */
-int d_recwrite(P1(CONST char FAR *) DBN_Dn);   /* recwrite.c */
-int d_renfile(P1(CONST char FAR *) Pi(FILE_NO) 
-                               Pi(CONST char FAR *));          /* renfile.c */
-int d_retries(P1(int));                                /* dblfcns.c */
-int d_rlbclr(P0);                              /* dblfcns.c */
-int d_rlbset(P0);                              /* dblfcns.c */
-int d_rlbtst(P0);                              /* dblfcns.c */
-int d_set_dberr(P1(FARPROC));                  /* dberr.c */
-#ifndef ONE_DB                            /* ONE_DB */
-int d_setdb(P1(int));                          /* setdb.c */
-#endif                                    /* ONE_DB */
-int d_setfree(P1(int) DBN_Dn);                 /* dblfcns.c */
-int d_setkey(P1(long) Pi(CONST char FAR *) DBN_Dn); /* makenew.c */
-int d_setlock(P1(int) Pi(char FAR *) DBN_Dn);  /* dblfcns.c */
-int d_setlstat(P1(int) Pi(char FAR *) DBN_Dn);         /* dblfcns.c */
-int d_setmm(P1(int) Pi(int) DBN_Dn);           /* setmm.c */
-int d_setmo(P1(int) Pi(int) DBN_Dn);           /* setmo.c */
-int d_setmr(P1(int) DBN_Dn);                   /* setmr.c */
-int d_setom(P1(int) Pi(int) DBN_Dn);           /* setom.c */
-int d_setoo(P1(int) Pi(int) DBN_Dn);           /* setoo.c */
-int d_setor(P1(int) DBN_Dn);                   /* setor.c */
-int d_setrm(P1(int) DBN_Dn);                   /* setrm.c */
-int d_setro(P1(int) DBN_Dn);                   /* setro.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_stscm(P1(int) Pi(ULONG) DBN_Dn);                 /* stscm.c */
-int d_stsco(P1(int) Pi(ULONG) DBN_Dn);                 /* stsco.c */
-int d_stscr(P1(ULONG));                                /* stscr.c */
-int d_stscs(P1(int) Pi(ULONG) DBN_Dn);                 /* stscs.c */
-#endif                                    /* NO_TIMESTAMP */
-int d_timeout(P1(int));                                /* dblfcns.c */
-int d_trabort(P0);                             /* dblfcns.c */
-int d_trbegin(P1(CONST char FAR *));           /* dblfcns.c */
-int d_trend(P0);                                       /* dblfcns.c */
-#ifndef NO_TIMESTAMP                      /* NO_TIMESTAMP */
-int d_utscm(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* utscm.c */
-int d_utsco(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* utsco.c */
-int d_utscr(P1(ULONG FAR *));                  /* utscr.c */
-int d_utscs(P1(int) Pi(ULONG FAR *) DBN_Dn);   /* utscs.c */
-#endif                                    /* NO_TIMESTAMP */
-
-#endif                                 /* MULTI_TASK */
+int d_rerdcurr(DB_ADDR **);            /* rwcurr.c */
+int d_rdcurr(DB_ADDR **, int *);       /* rwcurr.c */
+int d_wrcurr(DB_ADDR *);                       /* rwcurr.c */
+int d_recfree(int, int);                       /* dblfcns.c */
+int d_recfrst(int, int);                       /* recfrst.c */
+int d_reclast(int, int);                       /* reclast.c */
+int d_reclock(int, char *, int);       /* dblfcns.c */
+int d_reclstat(int, char *, int);      /* dblfcns.c */
+int d_recover(const char *);           /* recover.c */
+int d_recread(char *, int);            /* recread.c */
+int d_recset(int, int);                        /* recset.c */
+int d_recwrite(const char *, int);     /* recwrite.c */
+int d_renfile(const char *dbn, FILE_NO fno, const char *fnm);          /* renfile.c */
+int d_retries(int);                            /* dblfcns.c */
+int d_rlbclr(void);                            /* dblfcns.c */
+int d_rlbset(void);                            /* dblfcns.c */
+int d_rlbtst(void);                            /* dblfcns.c */
+int d_set_dberr(FARPROC);                      /* dberr.c */
+int d_setdb(int);                              /* setdb.c */
+int d_setfree(int, int);                       /* dblfcns.c */
+int d_setkey(long, const char *, int); /* makenew.c */
+int d_setlock(int, char *, int);       /* dblfcns.c */
+int d_setlstat(int, char *, int);      /* dblfcns.c */
+int d_setmm(int, int, int);            /* setmm.c */
+int d_setmo(int, int, int);            /* setmo.c */
+int d_setmr(int, int);                 /* setmr.c */
+int d_setom(int, int, int);            /* setom.c */
+int d_setoo(int, int, int);            /* setoo.c */
+int d_setor(int, int);                 /* setor.c */
+int d_setrm(int, int);                 /* setrm.c */
+int d_setro(int, int);                 /* setro.c */
+int d_timeout(int);                            /* dblfcns.c */
+int d_trabort(void);                           /* dblfcns.c */
+int d_trbegin(const char *);           /* dblfcns.c */
+int d_trend(void);                                     /* dblfcns.c */
 
-int dberr(P1(int));                            /* dberr.c */
+int dberr(int);                        /* dberr.c */
 
 #define D_FUNCTIONS_H
 /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC -f/usr/users/master/config/nonwin dproto.h */
index 5627d8b6eba80a11390faaad5a1511af252ce50a..90ed9f7292fdd6fdd207d96b5f67976146193444 100644 (file)
@@ -1,14 +1,16 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-CLEANFILES = y.tab.c y.tab.h boolyac.h boolyac.c
-
 SUBDIRS = raima
 
 lib_LTLIBRARIES = libDtSearch.la
 
-YFLAGS = -d
+BUILT_SOURCES = boolyac.h boolyac.c
+CLEANFILES = boolyac.h boolyac.c
+AM_YFLAGS = -d
+
+libDtSearch_la_CFLAGS = -DI18N_MSG -DMULTIBYTE -I./raima \
+                       -I$(top_builddir)/include/Dt
 
-libDtSearch_la_CFLAGS = -DI18N_MSG -DMULTIBYTE -I./raima
 
 libDtSearch_la_LIBADD = raima/libraima.la
 
@@ -36,7 +38,7 @@ endif
 
 libDtSearch_la_SOURCES = apndext.c     ausdopen.c      ausexit.c \
                         bmstrstr.c     boolpars.c      boolsrch.c \
-                        boolyac.c      cuslang.c       dbchange.c \
+                        boolyac.y      cuslang.c       dbchange.c \
                         dberr.c        delspace.c      dtoe.c \
                         dtoeinit.c     dtsrapi.c       dtsrdbrec.c \
                         dtsrjoint.c    dtsrswab.c      dtsrutil.c  \
@@ -49,10 +51,4 @@ libDtSearch_la_SOURCES = apndext.c   ausdopen.c      ausexit.c \
                         readchar.c     strupr.c        userint.c \
                         vedelete.c     vestatis.c      vstfunct.c
 
-all:: boolyac.c
 
-boolyac.h boolyac.c: boolyac.y
-       $(YACC) $(YFLAGS) boolyac.y
-       $(MV) y.tab.c boolyac.c
-       @if [ -f y.tab.h ]; then set -x; $(MV) y.tab.h boolyac.h; \
-       else exit 0; fi
index 867c7f0dca8d83f3f328a004c423b39015ebedb9..3daa58ddc1d2104ceb87f91bd95389b0d4bfe0ff 100644 (file)
@@ -5,15 +5,16 @@ noinst_LTLIBRARIES = libraima.la
 libraima_la_LIBADD = -lc -lm
 
 libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"${prefix}\" \
+                    -I$(top_builddir)/include/Dt \
                     -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
                     -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE
 
 if LINUX
-libraima_la_CFLAGS += DBYTE_SWAP -D_XOPEN_SOURCE=700
+libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700
 endif
 
 if BSD
-libraima_la_CFLAGS += DBYTE_SWAP -D_XOPEN_SOURCE=700
+libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700
 endif
 
 if SOLARIS
diff --git a/cde/lib/DtSearch/raima/dproto.h b/cde/lib/DtSearch/raima/dproto.h
deleted file mode 100644 (file)
index ec20404..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/* $XConsortium: dproto.h /main/2 1996/05/09 04:05:13 drk $ */
-/*
- *   COMPONENT_NAME: austext
- *
- *   FUNCTIONS: Pi
- *             d_alloc
- *             d_calloc
- *             d_cmstat
- *             d_cmtype
- *             d_connect
- *             d_costat
- *             d_cotype
- *             d_crget
- *             d_crread
- *             d_crset
- *             d_crtype
- *             d_crwrite
- *             d_csmget
- *             d_csmread
- *             d_csmset
- *             d_csmwrite
- *             d_csoget
- *             d_csoread
- *             d_csoset
- *             d_csowrite
- *             d_csstat
- *             d_ctbpath
- *             d_ctscm
- *             d_ctsco
- *             d_ctscr
- *             d_dbdpath
- *             d_dbfpath
- *             d_dblog
- *             d_dbtaf
- *             d_dbuserid
- *             d_decode_dba
- *             d_destroy
- *             d_discon
- *             d_encode_dba
- *             d_fillnew
- *             d_findco
- *             d_findfm
- *             d_findlm
- *             d_findnm
- *             d_findpm
- *             d_free
- *             d_gtscm
- *             d_gtsco
- *             d_gtscr
- *             d_gtscs
- *             d_initfile
- *             d_ismember
- *             d_isowner
- *             d_keydel
- *             d_keyexist
- *             d_keyfind
- *             d_keyfree
- *             d_keyfrst
- *             d_keylast
- *             d_keylock
- *             d_keylstat
- *             d_keynext
- *             d_keyprev
- *             d_keyread
- *             d_keystore
- *             d_lock
- *             d_makenew
- *             d_mapchar
- *             d_members
- *             d_memlock
- *             d_memlock_group
- *             d_memunlock
- *             d_memunlock_group
- *             d_off_opt
- *             d_on_opt
- *             d_open
- *             d_rdcurr
- *             d_recfree
- *             d_recfrst
- *             d_reclast
- *             d_reclock
- *             d_reclstat
- *             d_recover
- *             d_recread
- *             d_recset
- *             d_recstat
- *             d_recwrite
- *             d_renfile
- *             d_rerdcurr
- *             d_retries
- *             d_set_dberr
- *             d_setdb
- *             d_setfiles
- *             d_setfree
- *             d_setkey
- *             d_setlock
- *             d_setlstat
- *             d_setmm
- *             d_setmo
- *             d_setmr
- *             d_setom
- *             d_setoo
- *             d_setor
- *             d_setpages
- *             d_setrm
- *             d_setro
- *             d_stscm
- *             d_stsco
- *             d_stscr
- *             d_stscs
- *             d_timeout
- *             d_trbegin
- *             d_trlog
- *             d_utscm
- *             d_utsco
- *             d_utscr
- *             d_utscs
- *             d_wrcurr
- *             dberr
- *             dt_closetask
- *             dt_opentask
- *
- *   ORIGINS: 157
- *
- */
-/*----------------------------------------------------------------------------
-   dproto.h: db_VISTA (user) function declaration header file
-
-   (C) Copyright 1988 by Raima Corporation.
-----------------------------------------------------------------------------*/
-
-/* ********************** EDIT HISTORY *******************************
-
- SCR    DATE    INI                   DESCRIPTION
------ --------- --- -----------------------------------------------------
-  571 31-Jan-89 RSC Placed ctbpath inside NO_COUNTRY, not NO_TIMESTAMP
-*/
-
-
-int d_setfiles(int);                           /* dio.c */
-int d_setpages(int, int);                      /* dio.c */
-int d_trbound(void);                           /* trlog.c */
-int d_trlog(int, int, const char *, int); 
-                                                               /* trlog.c */
-int d_trmark(void);                            /* trlog.c */
-int d_tron(void);                                      /* trlog.c */
-int d_troff(void);                                     /* trlog.c */
-int d_decode_dba(DB_ADDR, int *, long *); 
-                                                               /* dbacode.c */
-int d_encode_dba(int, long, DB_ADDR *); 
-                                                               /* dbacode.c */
-
-#define d_memlock(p)           /**/
-#define d_memlock_group(lg)    S_OKAY
-#define d_memunlock(p)         /**/
-#define d_memunlock_group(lg)  /**/
-char * d_alloc(unsigned);              /* alloc.c */
-char * d_calloc(unsigned, unsigned);   /* alloc.c */
-void d_free(CHAR_P *);                 /* alloc.c */
-
-#define dt_opentask(a) S_OKAY
-#define dt_closetask(a) S_OKAY
-
-int d_close(void);                                     /* dblfcns.c */
-int d_cmstat(int, int);                        /* cmstat.c */
-int d_cmtype(int, int *, int);         /* cmtype.c */
-int d_connect(int, int);                       /* connect.c */
-int d_cotype(int, int *, int);         /* cotype.c */
-int d_crget(DB_ADDR *, int);           /* crget.c */
-int d_crread(long, char *, int);       /* crread.c */
-int d_crset(DB_ADDR *, int);           /* crset.c */
-int d_crtype(int *, int);              /* crtype.c */
-int d_crwrite(long, char *, int);      /* crwrite.c */
-int d_csmget(int, DB_ADDR *, int);     /* csmget.c */
-int d_csmread(int, long, char *, int); 
-                                                               /* csmread.c */
-int d_csmset(int, DB_ADDR *, int);     /* csmset.c */
-int d_csmwrite(int, long, const char *, int); 
-                                                               /* csmwrite.c */
-int d_csoget(int, DB_ADDR *, int);     /* csoget.c */
-int d_csoread(int, long, char *, int); 
-                                                               /* csoread.c */
-int d_csoset(int, DB_ADDR *, int);     /* csoset.c */
-int d_csowrite(int, long, const char *, int); 
-                                                               /* csowrite.c */
-int d_ctbpath(const char *);           /* pathfcns.c */
-int d_dbdpath(const char *);           /* dbdpath.c */
-int d_dbfpath(const char *);           /* dbfpath.c */
-int d_dblog(const char *);             /* dblog.c */
-int d_dbtaf(const char *);             /* dbtaf.c */
-int d_dbuserid(const char *);          /* dbuserid.c */
-int d_delete(int);                             /* delete.c */
-int d_disdel(int);                             /* disdel.c */
-int d_recnext(int);                            /* recnext.c */
-int d_recprev(int);                            /* recprev.c */
-int d_destroy(const char *);           /* destroy.c */
-int d_discon(int, int);                        /* discon.c */
-int d_fillnew(int, const char *, int); /* fillnew.c */
-int d_findco(int, int);                        /* findco.c */
-int d_findfm(int, int);                        /* findfm.c */
-int d_findlm(int, int);                        /* findlm.c */
-int d_findnm(int, int);                        /* findnm.c */
-int d_findpm(int, int);                        /* findpm.c */
-int d_freeall(void);                           /* dblfcns.c */
-int d_initialize(int);                         /* initial.c */
-int d_initfile(FILE_NO, int);                  /* initial.c */
-int d_ismember(int, int);                      /* ismember.c */
-int d_isowner(int, int);                       /* isowner.c */
-int d_keydel(long, int);                       /* keydel.c */
-int d_keyexist(long, int);                     /* keyexist.c */
-int d_keyfind(long, const char *, int); 
-                                                               /* keyfind.c */
-int d_keyfree(long, int);                      /* dblfcns.c */
-int d_keyfrst(long, int);                      /* keyfrst.c */
-int d_keylast(long, int);                      /* keylast.c */
-int d_keylock(long, char *, int);      /* dblfcns.c */
-int d_keylstat(long, char *, int);     /* dblfcns.c */
-int d_keynext(long, int);                      /* keynext.c */
-int d_keyprev(long, int);                      /* keyprev.c */
-int d_keyread(char *);                 /* keyfcns.c */
-int d_keystore(long, int);                     /* keystore.c */
-int d_lock(int, LOCK_REQUEST *, int); /* dblfcns.c */
-int d_makenew(int, int);                       /* makenew.c */
-int d_mapchar(unsigned char, unsigned char, const char *, unsigned char);  /* mapchar.c */
-int d_members(int, LONG *, int);       /* members.c */
-int d_off_opt(int);                            /* options.c */
-int d_on_opt(int);                             /* options.c */
-int d_open(const char *, const char *); 
-                                                               /* dblfcns.c */
-int d_rerdcurr(DB_ADDR **);            /* rwcurr.c */
-int d_rdcurr(DB_ADDR **, int *);       /* rwcurr.c */
-int d_wrcurr(DB_ADDR *);                       /* rwcurr.c */
-int d_recfree(int, int);                       /* dblfcns.c */
-int d_recfrst(int, int);                       /* recfrst.c */
-int d_reclast(int, int);                       /* reclast.c */
-int d_reclock(int, char *, int);       /* dblfcns.c */
-int d_reclstat(int, char *, int);      /* dblfcns.c */
-int d_recover(const, char *);          /* recover.c */
-int d_recread(char *, int);            /* recread.c */
-int d_recset(int, int);                        /* recset.c */
-int d_recwrite(const char *, int);     /* recwrite.c */
-int d_renfile(const char *dbn, FILE_NO fno, const char *fnm);          /* renfile.c */
-int d_retries(int);                            /* dblfcns.c */
-int d_rlbclr(void);                            /* dblfcns.c */
-int d_rlbset(void);                            /* dblfcns.c */
-int d_rlbtst(void);                            /* dblfcns.c */
-int d_set_dberr(FARPROC);                      /* dberr.c */
-int d_setdb(int);                              /* setdb.c */
-int d_setfree(int, int);                       /* dblfcns.c */
-int d_setkey(long, const char *, int); /* makenew.c */
-int d_setlock(int, char *, int);       /* dblfcns.c */
-int d_setlstat(int, char *, int);      /* dblfcns.c */
-int d_setmm(int, int, int);            /* setmm.c */
-int d_setmo(int, int, int);            /* setmo.c */
-int d_setmr(int, int);                 /* setmr.c */
-int d_setom(int, int, int);            /* setom.c */
-int d_setoo(int, int, int);            /* setoo.c */
-int d_setor(int, int);                 /* setor.c */
-int d_setrm(int, int);                 /* setrm.c */
-int d_setro(int, int);                 /* setro.c */
-int d_timeout(int);                            /* dblfcns.c */
-int d_trabort(void);                           /* dblfcns.c */
-int d_trbegin(const char *);           /* dblfcns.c */
-int d_trend(void);                                     /* dblfcns.c */
-
-int dberr(int);                        /* dberr.c */
-
-#define D_FUNCTIONS_H
-/* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC -f/usr/users/master/config/nonwin dproto.h */