Package: grx Version: 2.4.6p3 Author: Guillem Jover Status: not-sent Description: Link shared libraries with all needed dependencies. Thus allowing to use the same name for X and non-X enabled library. diff -Naur grx-2.4.6p3_makefile+configure/pascal/bgi/makefile.x11 grx-2.4.6p3_lib-deps/pascal/bgi/makefile.x11 --- grx-2.4.6p3_makefile+configure/pascal/bgi/makefile.x11 2001-12-23 02:31:34.000000000 +0100 +++ grx-2.4.6p3_lib-deps/pascal/bgi/makefile.x11 2003-05-25 16:38:09.000000000 +0200 @@ -9,7 +9,7 @@ include ../../makedefs.grx UNITPATH = --unit-path=.. -GRXLIB = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a +GRXLIB = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20.a GRXLIBPATH = -L../../lib/$(GRX_LIB_SUBDIR) LIBS= $(GRXLIBPATH) $(GRXLIB) $(X11LIBS) -lm diff -Naur grx-2.4.6p3_makefile+configure/pascal/makefile.x11 grx-2.4.6p3_lib-deps/pascal/makefile.x11 --- grx-2.4.6p3_makefile+configure/pascal/makefile.x11 2002-01-07 01:53:04.000000000 +0100 +++ grx-2.4.6p3_lib-deps/pascal/makefile.x11 2003-05-25 16:38:09.000000000 +0200 @@ -8,7 +8,7 @@ include ../makedefs.grx -GRXLIB = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a +GRXLIB = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a GRXLIBPATH = -L../lib/$(GRX_LIB_SUBDIR) LIBS= $(GRXLIBPATH) $(GRXLIB) $(X11LIBS) -lm diff -Naur grx-2.4.6p3_makefile+configure/src/makefile.lnx grx-2.4.6p3_lib-deps/src/makefile.lnx --- grx-2.4.6p3_makefile+configure/src/makefile.lnx 2003-05-25 16:36:46.000000000 +0200 +++ grx-2.4.6p3_lib-deps/src/makefile.lnx 2003-05-25 16:38:09.000000000 +0200 @@ -11,7 +11,7 @@ INCDIR= -I. -I./include -I../include CCOPT += -DLFB_BY_NEAR_POINTER -pipe -ADDON_LIBS = +ADDON_LIBS = -lm ifdef GRX_DEFAULT_FONT_PATH CCOPT += -DGRX_DEFAULT_FONT_PATH=\"$(GRX_DEFAULT_FONT_PATH)\" @@ -145,15 +145,16 @@ $(GRX20SHna): $(LINUX_i386_CONSOLE) $(LO) -rm -f $(GRX20SHna) - $(CC) -shared -Wl,-soname,$(notdir $(GRX20SHli)) -o $(GRX20SHna) $(LO) + $(CC) -shared -Wl,-soname,$(notdir $(GRX20SHli)) $(ADDON_LIBS) \ + -o $(GRX20SHna) $(LO) ln -sf $(notdir $(GRX20SHna)) $(GRX20SHli) $(UTILP): ../bin/% : utilprog/%.o $(GRX20ST) - $(CC) -o $@ utilprog/$*.o $(GRX20ST) $(ADDON_LIBS) -lm + $(CC) -o $@ utilprog/$*.o $(GRX20ST) $(ADDON_LIBS) $(STRIP) $@ $(UTILPS): ../bin/% : utilprog/%.o $(GRX20ST) - $(CC) -o $@ utilprog/$*.o $(GRX20ST) $(ADDON_LIBS) -lm + $(CC) -o $@ utilprog/$*.o $(GRX20ST) $(ADDON_LIBS) $(STRIP) $@ chmod $(EXECBITS) $@ diff -Naur grx-2.4.6p3_makefile+configure/src/makefile.x11 grx-2.4.6p3_lib-deps/src/makefile.x11 --- grx-2.4.6p3_makefile+configure/src/makefile.x11 2003-05-25 16:36:46.000000000 +0200 +++ grx-2.4.6p3_lib-deps/src/makefile.x11 2003-05-25 16:38:09.000000000 +0200 @@ -33,9 +33,9 @@ ADDON_LIBS += -lXxf86dga -lXext endif -GRX20ST = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a +GRX20ST = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a -GRX20SH = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.so +GRX20SH = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.so GRX20SHli = $(GRX20SH).$(word 1,$(subst ., ,$(GRX_VERSION))) GRX20SHna = $(GRX20SH).$(GRX_VERSION) SHCCOPT = -fPIC -D__SHARED__ @@ -139,7 +139,8 @@ $(GRX20SHna): $(LINUX_i386_X11) $(LO) -rm -f $(GRX20SHna) - $(CC) -shared -Wl,-soname,$(notdir $(GRX20SHli)) -o $(GRX20SHna) $(LO) + $(CC) -shared -Wl,-soname,$(notdir $(GRX20SHli)) \ + $(ADDON_LIBS) $(X11LIBS) -o $(GRX20SHna) $(LO) ln -sf $(notdir $(GRX20SHna)) $(GRX20SHli) $(UTILP): ../bin/% : utilprog/%.o $(GRX20ST) diff -Naur grx-2.4.6p3_makefile+configure/test/bgi/makefile.x11 grx-2.4.6p3_lib-deps/test/bgi/makefile.x11 --- grx-2.4.6p3_makefile+configure/test/bgi/makefile.x11 2003-04-02 21:36:34.000000000 +0200 +++ grx-2.4.6p3_lib-deps/test/bgi/makefile.x11 2003-05-25 16:38:09.000000000 +0200 @@ -10,9 +10,9 @@ INCDIR= -I../../include # Enable this line for static linked test progs (default) -GRX20X = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a +GRX20 = ../../lib/$(GRX_LIB_SUBDIR)/libgrx20.a # or this if you've already installed the shared libs -#GRX20X = -L./../lib/$(GRX_LIB_SUBDIR) -lgrx20X +#GRX20 = -L./../lib/$(GRX_LIB_SUBDIR) -lgrx20 ifeq ($(SET_XSUIDROOT),y) EXECBITS = 4755 @@ -38,7 +38,7 @@ ADDON_LIBS += -lz endif -LIBS= $(GRX20X) $(ADDON_LIBS) $(X11LIBS) -lm +LIBS= $(GRX20) $(ADDON_LIBS) $(X11LIBS) -lm ifndef DEBUG LDOPT += -s @@ -58,7 +58,7 @@ all: $(PROGS) -$(PROGS): x%: %.o $(GRX20X) +$(PROGS): x%: %.o $(GRX20) $(CC) $(LDOPT) -o $@ $*.o $(LIBS) chmod $(EXECBITS) $@ diff -Naur grx-2.4.6p3_makefile+configure/test/makefile.x11 grx-2.4.6p3_lib-deps/test/makefile.x11 --- grx-2.4.6p3_makefile+configure/test/makefile.x11 2003-04-02 21:36:34.000000000 +0200 +++ grx-2.4.6p3_lib-deps/test/makefile.x11 2003-05-25 16:38:09.000000000 +0200 @@ -10,9 +10,9 @@ INCDIR= -I../include # Enable this line for static linked test progs (default) -GRX20X = ../lib/$(GRX_LIB_SUBDIR)/libgrx20X.a +GRX20 = ../lib/$(GRX_LIB_SUBDIR)/libgrx20.a # or this if you've already installed the shared libs -#GRX20X = -L../lib/$(GRX_LIB_SUBDIR) -lgrx20X +#GRX20 = -L../lib/$(GRX_LIB_SUBDIR) -lgrx20 ifeq ($(SET_XSUIDROOT),y) EXECBITS = 4755 @@ -42,7 +42,7 @@ ADDON_LIBS += -lz endif -LIBS= $(GRX20X) $(ADDON_LIBS) $(X11LIBS) -lm +LIBS= $(GRX20) $(ADDON_LIBS) $(X11LIBS) -lm ifndef DEBUG LDOPT += -s @@ -78,11 +78,11 @@ all: $(PROGS) xdemogrx -xdemogrx: demogrx.o gfaz.o $(GRX20X) +xdemogrx: demogrx.o gfaz.o $(GRX20) $(CC) $(LDOPT) -o xdemogrx demogrx.o gfaz.o $(LIBS) chmod $(EXECBITS) xdemogrx -$(PROGS): x%: %.o $(GRX20X) +$(PROGS): x%: %.o $(GRX20) $(CC) $(LDOPT) -o $@ $*.o $(LIBS) chmod $(EXECBITS) $@