GopherProxy

	Make building easier for non-Linux systems. - sam - An updated version of the s…
	git clone git://vernunftzentrum.de/sam.git
	Log
	Files
	Refs
	LICENSE
	---
	commit 910f2c41a31c2d2ef3618873b4dcc774715baec6
	parent 71a246b104091fa21c97c7c1838b3ca566099a85
	Author: Rob King <[email protected]>
	Date: Mon, 15 Aug 2016 11:20:21 -0500

	Make building easier for non-Linux systems.

	Diffstat:
	Makefile \| 2 +-
	README.rst \| 6 +++---
	config.mk.def \| 10 +++++++---
	libXg/Makefile \| 5 +++--
	libframe/Makefile \| 5 +++--
	rsam/Makefile \| 2 ++
	sam/Makefile \| 2 +-
	samterm/Makefile \| 5 +++--

	8 files changed, 23 insertions(+), 14 deletions(-)
	---
	diff --git a/Makefile b/Makefile
	@@ -4,7 +4,7 @@
	# master makefile for sam. configure sub-makefiles first.
	#

	-MODE?=system
	+MODE?=user

	all: config.h config.mk commands.h lXg lframe rsamdir samdir samtermdir…

	diff --git a/README.rst b/README.rst
	@@ -43,10 +43,10 @@ Installation and configuration is fairly simple:
	- Run `make install` or, if needed, `sudo make install`

	Note that running `make install` will install a `desktop entry file`_, in eith…
	-This can be specified via the `MODE` make variable (the default is "system").
	-To isntall the desktop entry for the local user only, use:
	+This can be specified via the `MODE` make variable (the default is "user").
	+To isntall the desktop entry for the all users, use:

	- make MODE=user install
	+ make MODE=system install

	The `sam` command runs sam.
	The `B` command adds a new file to a running instance of sam, or starts sam if…
	diff --git a/config.mk.def b/config.mk.def
	@@ -10,6 +10,9 @@ BINDIR?=$(DESTDIR)/bin
	# MANDIR is where manual pages go
	MANDIR?=$(DESTDIR)/share/man/man1

	-# FREETYPEINC should name the directory of your freetype2 includes.
	-FREETYPEINC?=/usr/include/freetype2
	-
	+# Add additional include and library directories
	+# BSD/Mac OS X users might need to add something like
	+# INCLUDES?=-I/usr/X11R6/include -I/usr/X11R6/include/freetype2
	+# LDFLAGS?=-L/usr/X11R6/lib
	+INCLUDES?=-I/usr/include/freetype2
	+LDFLAGS?=
	+\ No newline at end of file
	diff --git a/libXg/Makefile b/libXg/Makefile
	@@ -13,7 +13,8 @@ include ../config.mk
	OS=-DIRIX5

	# add -Iincludedir for any include directories that need to be searched
	-INCS=-I../include -I$(FREETYPEINC)
	+INCS=-I../include
	+

	# set this if your X libraries are in different locations
	# or if you need extra libraries to load with X11 applications
	@@ -28,7 +29,7 @@ AR=ar
	# the name of the library
	LIB=libXg.a

	-CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS)
	+CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS) $(INCLUDES)
	CC?=gcc

	OBJS= arc.o arith.o balloc.o bitblt.o bitbltclip.o border.o bscreenrect…
	diff --git a/libframe/Makefile b/libframe/Makefile
	@@ -14,7 +14,8 @@ OS=-DIRIX5

	# add -Iincludedir for any include directories that need to be searched
	# for posix header files (for UMIPS, add -I/usr/include/posix)
	-INCS=-I../include -I$(FREETYPEINC)
	+INCS=-I../include
	+

	# add name of library orderer - use ":" if none exists
	RANLIB=:
	@@ -22,7 +23,7 @@ RANLIB=:
	# add name of library
	AR=ar

	-CFLAGS=-c $(OS) $(INCS) -D_LIBXG_EXTENSION
	+CFLAGS=-c $(OS) $(INCS) -D_LIBXG_EXTENSION $(INCLUDES)

	LIB=libframe.a
	CC?=gcc
	diff --git a/rsam/Makefile b/rsam/Makefile
	@@ -9,6 +9,8 @@ LDFLAGS=
	all: rsam

	rsam: rsam.o
	+ $(CC) -o rsam rsam.o
	+

	clean:
	rm -f *.o rsam
	diff --git a/sam/Makefile b/sam/Makefile
	@@ -42,7 +42,7 @@ RXSAMNAME=rsam

	SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave

	-CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS)
	+CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS) $(INCLUDES)

	LIB=../libframe/libframe.a ../libXg/libXg.a
	CC?=gcc
	diff --git a/samterm/Makefile b/samterm/Makefile
	@@ -17,7 +17,8 @@ OS=-DIRIX5

	# add -Iincludedir for any include directories that need to be searched
	# for posix header files (for UMIPS, add -I/usr/include/posix)
	-INCS=-I../include -I$(FREETYPEINC)
	+INCS=-I../include
	+

	# SAMTERM contains the name of the file containing the samterm
	# executable.
	@@ -27,7 +28,7 @@ SAMTERM=$(BINDIR)/samterm
	# or if you need extra libraries to load with X11 applications
	XLIBS=-lXt -lX11 -lXft

	-CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
	+CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION $(INCLUDES)

	LIBS=../libframe/libframe.a ../libXg/libXg.a
	CC?=gcc