34 lines
1.5 KiB
Plaintext
34 lines
1.5 KiB
Plaintext
$OpenBSD: patch-src_unix-dll_mak,v 1.4 2006/10/19 13:12:37 kili Exp $
|
|
--- src/unix-dll.mak.orig Mon Mar 13 17:18:19 2006
|
|
+++ src/unix-dll.mak Sat Sep 30 22:25:32 2006
|
|
@@ -43,11 +43,11 @@ GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_X
|
|
|
|
# shared library
|
|
GS_SONAME=lib$(GS).so
|
|
-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
|
|
-GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
|
|
+GS_SONAME_MAJOR=$(GS_SONAME).$(LIBgs_VERSION:R)
|
|
+GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(LIBgs_VERSION)
|
|
GS_SO=$(BINDIR)/$(GS_SONAME)
|
|
-GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR)
|
|
-GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR)
|
|
+GS_SO_MAJOR=$(GS_SO).$(LIBgs_VERSION:R)
|
|
+GS_SO_MAJOR_MINOR=$(GS_SO).$(LIBgs_VERSION)
|
|
|
|
# Shared object is built by redefining GS_XE in a recursive make.
|
|
|
|
@@ -67,11 +67,11 @@ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
|
|
$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
|
|
|
|
$(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
|
|
- $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
|
|
+ $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) $(XLDFLAGS) $(XLIBDIRS) -lXt -lSM -lICE -lXext -lX11 -lpng
|
|
|
|
# ------------------------- Recursive make targets ------------------------- #
|
|
|
|
-SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname=$(GS_SONAME_MAJOR)'\
|
|
+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared'\
|
|
GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
|
|
STDIO_IMPLEMENTATION=c\
|
|
DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
|