Attachment #53996 for bug #86072




EXE=

# todo: this needs to be .dylib on OS X - write a test
#SHARED_LDFLAGS=-shared
#SHARED_OBJ=.so
SHARED_LDFLAGS=-dynamiclib
SHARED_OBJ=.dylib

FE=-o 
IJS_EXEC_SERVER=ijs_exec_unix$(OBJ)

	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config

install:	all
	$(INSTALL) ijs_client_example$(EXE) $(DESTDIR)$(bindir)/ijs_client_example$(EXE)
	$(INSTALL) ijs-config $(DESTDIR)$(bindir)/ijs-config
	$(INSTALL) libijs.a $(DESTDIR)$(libdir)/libijs.a
	$(INSTALL) libijs$(SHARED_OBJ) $(DESTDIR)$(libdir)/libijs$(SHARED_OBJ)
	-mkdir $(DESTDIR)$(pkgincludedir)




GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)

# shared library
GS_SONAME=lib$(GS).dylib
GS_SONAME_MAJOR=lib$(GS).$(GS_VERSION_MAJOR).dylib
GS_SONAME_MAJOR_MINOR=lib$(GS).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).dylib
GS_SO=$(BINDIR)/$(GS_SONAME)
GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
GS_SO_MAJOR_MINOR=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)

# Shared object is built by redefining GS_XE in a recursive make.



# ------------------------- Recursive make targets ------------------------- #

SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name $(GS_SO_MAJOR)'\
 GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
 STDIO_IMPLEMENTATION=c\
 DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\

Lines 25-31 Link Here

(-)ijs/ijs_server_example.c.orig (-1 / +1 lines)
25	#include <stdio.h>	25	#include <stdio.h>
26	#include <stdlib.h>	26	#include <stdlib.h>
27	#include <string.h>	27	#include <string.h>
28	#include <malloc.h>	28	#include <malloc/malloc.h>
29	#include "ijs.h"	29	#include "ijs.h"
30	#include "ijs_server.h"	30	#include "ijs_server.h"
31		31

Lines 134-140 Link Here

(-)src/unixinst.mak.orig (-1 / +1 lines)
134	ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\	134	ln -s ps2pdf.$(man1ext) $$f.$(man1ext) ) ;\
135	done ;\	135	done ;\
136	fi ;\	136	fi ;\
137	if ( test -f $$man1dir/ps2ps.$(man1ext) ) ;\	137	if ( test -f $$man1dir/gslp.$(man1ext) ) ;\
138	then for f in $(MAN1_LINKS_GSLP) ;\	138	then for f in $(MAN1_LINKS_GSLP) ;\
139	do ( cd $$man1dir; rm -f $$f.$(man1ext) ;\	139	do ( cd $$man1dir; rm -f $$f.$(man1ext) ;\
140	ln -s gslp.$(man1ext) $$f.$(man1ext) ) ;\	140	ln -s gslp.$(man1ext) $$f.$(man1ext) ) ;\

Return to bug 86072

Lines 45-56 Link Here

(-)src/unix-dll.mak.orig (-6 / +6 lines)
45	GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)	45	GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
46		46
47	# shared library	47	# shared library
48	GS_SONAME=lib$(GS).so	48	GS_SONAME=lib$(GS).dylib
49	GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)	49	GS_SONAME_MAJOR=lib$(GS).$(GS_VERSION_MAJOR).dylib
50	GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)	50	GS_SONAME_MAJOR_MINOR=lib$(GS).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).dylib
51	GS_SO=$(BINDIR)/$(GS_SONAME)	51	GS_SO=$(BINDIR)/$(GS_SONAME)
52	GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR)	52	GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
53	GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR)	53	GS_SO_MAJOR_MINOR=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)
54		54
55	# Shared object is built by redefining GS_XE in a recursive make.	55	# Shared object is built by redefining GS_XE in a recursive make.
56		56
Lines 74-80 Link Here
74		74
75	# ------------------------- Recursive make targets ------------------------- #	75	# ------------------------- Recursive make targets ------------------------- #
76		76
77	SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\	77	SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name $(GS_SO_MAJOR)'\
78	GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\	78	GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
79	STDIO_IMPLEMENTATION=c\	79	STDIO_IMPLEMENTATION=c\
80	DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\	80	DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\

Lines 7-16 Link Here

(-)ijs/Makefile.in.orig (-6 / +6 lines)
7	EXE=	7	EXE=
8		8
9	# todo: this needs to be .dylib on OS X - write a test	9	# todo: this needs to be .dylib on OS X - write a test
10	SHARED_LDFLAGS=-shared	10	#SHARED_LDFLAGS=-shared
11	SHARED_OBJ=.so	11	#SHARED_OBJ=.so
12	#SHARED_LDFLAGS=-dylib	12	SHARED_LDFLAGS=-dynamiclib
13	#SHARED_OBJ=.dylib	13	SHARED_OBJ=.dylib
14		14
15	FE=-o	15	FE=-o
16	IJS_EXEC_SERVER=ijs_exec_unix$(OBJ)	16	IJS_EXEC_SERVER=ijs_exec_unix$(OBJ)
Lines 60-67 Link Here
60	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config	60	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config
61		61
62	install: all	62	install: all
63	$(INSTALL) ijs_client_example$(EXE) -c $(DESTDIR)$(bindir)/ijs_client_example$(EXE)	63	$(INSTALL) ijs_client_example$(EXE) $(DESTDIR)$(bindir)/ijs_client_example$(EXE)
64	$(INSTALL) ijs-config -c $(DESTDIR)$(bindir)/ijs-config	64	$(INSTALL) ijs-config $(DESTDIR)$(bindir)/ijs-config
65	$(INSTALL) libijs.a $(DESTDIR)$(libdir)/libijs.a	65	$(INSTALL) libijs.a $(DESTDIR)$(libdir)/libijs.a
66	$(INSTALL) libijs$(SHARED_OBJ) $(DESTDIR)$(libdir)/libijs$(SHARED_OBJ)	66	$(INSTALL) libijs$(SHARED_OBJ) $(DESTDIR)$(libdir)/libijs$(SHARED_OBJ)
67	-mkdir $(DESTDIR)$(pkgincludedir)	67	-mkdir $(DESTDIR)$(pkgincludedir)