Check-in [700f942023]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix build on clean FreeBSD machine. Still problem with installing.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:700f9420233183413d44d6d41860357b2a46a06a
User & Date: dbane 2014-02-12 23:27:47
Context
2014-02-12
23:39
Fix installation check-in: 9b29b86fb9 user: dbane tags: trunk
23:27
Fix build on clean FreeBSD machine. Still problem with installing. check-in: 700f942023 user: dbane tags: trunk
2014-02-07
22:53
Convert man markup to mdoc; formatting not perfect yet check-in: 9007d5e6a1 user: darrenbane tags: trunk
Changes

Changes to hdr/lbl.h.

13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 */

#ifndef _LBL_H_
#define _LBL_H_

#include	<stdio.h>
#include	<types.h>
#include	<ftypes.h>

/** Standard format for labels */
#define	STDFORM	"%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1"

/** First character to indicate a new directive in the temporary file */
#define	MAGIC1	'\01'








<







13
14
15
16
17
18
19

20
21
22
23
24
25
26
 */

#ifndef _LBL_H_
#define _LBL_H_

#include	<stdio.h>
#include	<types.h>


/** Standard format for labels */
#define	STDFORM	"%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1.%1"

/** First character to indicate a new directive in the temporary file */
#define	MAGIC1	'\01'

Changes to src/Makefile.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
.POSIX:

.include <bsd.own.mk>

PREFIX?= /Users/darrenbane
BINDIR= $(PREFIX)/bin
MANDIR= $(PREFIX)/share/man/man
PROG= lbl
CFLAGS+= -I../hdr -Wall -std=c11 -D_XOPEN_SOURCE=600
MAN= ../doc/lbl.1
SRCS= lbl.c actions.c build.c externs.c find.c keyword.c list.c \
      printl.c rescan.c scan.c signals.c
LIBC= /usr/lib/libSystem.dylib

.include <bsd.prog.mk>




|







|


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
.POSIX:

.include <bsd.own.mk>

PREFIX?= /home/dbane
BINDIR= $(PREFIX)/bin
MANDIR= $(PREFIX)/share/man/man
PROG= lbl
CFLAGS+= -I../hdr -Wall -std=c11 -D_XOPEN_SOURCE=600
MAN= ../doc/lbl.1
SRCS= lbl.c actions.c build.c externs.c find.c keyword.c list.c \
      printl.c rescan.c scan.c signals.c
LIBC= /lib/libc.so.7

.include <bsd.prog.mk>

Changes to src/lbl.c.

27
28
29
30
31
32
33

34
35
36
37
38
39
40
#include        <sysexits.h>
#include        <limits.h>
#include        <assert.h>
#include        "lbl.h"
#include        "signals.h"
#include        "scan.h"
#include        "rescan.h"


extern int lflag;
extern int sflag;
extern char delimiter;
extern char macroname[];
extern char tempname[];
extern char *progname;







>







27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
#include        <sysexits.h>
#include        <limits.h>
#include        <assert.h>
#include        "lbl.h"
#include        "signals.h"
#include        "scan.h"
#include        "rescan.h"
#include	"list.h"

extern int lflag;
extern int sflag;
extern char delimiter;
extern char macroname[];
extern char tempname[];
extern char *progname;

Changes to src/list.c.

5
6
7
8
9
10
11

12
13
14
15
16
17
18
 *	and that no use be made of the software for commercial
 *	purposes without the express written permission of the
 *	author.
 */

#include	<lbl.h>
#include        "list.h"


void	listtype(type *);

extern char *def_format;
extern LIST_HEAD(, type) typehead;

void







>







5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
 *	and that no use be made of the software for commercial
 *	purposes without the express written permission of the
 *	author.
 */

#include	<lbl.h>
#include        "list.h"
#include	"printl.h"

void	listtype(type *);

extern char *def_format;
extern LIST_HEAD(, type) typehead;

void

Changes to src/rescan.c.

8
9
10
11
12
13
14

15
16
17
18
19
20
21
 */

#include	<lbl.h>
#include	<ctype.h>
#include        <string.h>
#include        <err.h>
#include        "find.h"

#include        "rescan.h"

void	doreplace(void);
static void domagic(void);
static void getword(rg char *buffer);

extern char delimiter;







>







8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
 */

#include	<lbl.h>
#include	<ctype.h>
#include        <string.h>
#include        <err.h>
#include        "find.h"
#include	"printl.h"
#include        "rescan.h"

void	doreplace(void);
static void domagic(void);
static void getword(rg char *buffer);

extern char delimiter;