kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/x11/wxGTK/patches/patch-ab
dmcmahill 532db08129 make sure rpath is correctly set for the dependent libs. Fixes ELF rpath 
problems recently noted by Huberts bulk pkgsrc build.
2000-09-06 23:49:22 +00:00

322 lines
9.2 KiB
Text
Raw Blame History

$NetBSD: patch-ab,v 1.4 2000/09/06 23:49:22 dmcmahill Exp $
--- Makefile.in.orig Sun Aug 20 04:52:53 2000
+++ Makefile.in Thu Aug 31 20:41:33 2000
@@ -20,11 +20,11 @@
.c.o :
- $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+ ${LIBTOOL} --mode=compile $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) -o $@ $<
.cpp.o :
- $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+ ${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
.cxx.o :
- $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+ ${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
########################### Paths #################################
@@ -38,8 +38,4 @@
VP5 = @top_srcdir@/src/unix
VP6 = @top_srcdir@/src/html
-VP7 = @top_srcdir@/src/png
-VP8 = @top_srcdir@/src/jpeg
-VP9 = @top_srcdir@/src/tiff
-VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc
@@ -47,5 +43,5 @@
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP11) # ':' for autoconf
top_srcdir = @top_srcdir@
@@ -76,11 +72,14 @@
top_builddir = .
+EXTRALIBS=-lz -L@prefix@/lib -Wl,-R@prefix@/lib -ljpeg -lpng -ltiff
+
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DATA_DIR = ${BSD_INSTALL_DATA_DIR}
# my autoconf doesn't set this
-#INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
# maybe do an additional chmod if needed?
-INSTALL_SCRIPT = @INSTALL@
+#INSTALL_SCRIPT = @INSTALL@
transform = @program_transform_name@
@@ -111,8 +110,4 @@
HTMLDIR = $(WXDIR)/src/html
UNIXDIR = $(WXDIR)/src/unix
-PNGDIR = $(WXDIR)/src/png
-JPEGDIR = $(WXDIR)/src/jpeg
-TIFFDIR = $(WXDIR)/src/tiff
-ZLIBDIR = $(WXDIR)/src/zlib
GTKDIR = $(WXDIR)/src/gtk
MOTIFDIR = $(WXDIR)/src/motif
@@ -161,123 +156,4 @@
DEPFILES = @ALL_DEPFILES@
-# the object files of sublibraries (we assume that they don't change [often],
-# so we don't generate these lists with tmake but embed them here)
-ZLIBOBJS = \
- adler32.o \
- compress.o \
- crc32.o \
- gzio.o \
- uncompr.o \
- deflate.o \
- trees.o \
- zutil.o \
- inflate.o \
- infblock.o \
- inftrees.o \
- infcodes.o \
- infutil.o \
- inffast.o
-
-PNGOBJS = \
- png.o \
- pngread.o \
- pngrtran.o \
- pngrutil.o \
- pngpread.o \
- pngtrans.o \
- pngwrite.o \
- pngwtran.o \
- pngwutil.o \
- pngerror.o \
- pngmem.o \
- pngwio.o \
- pngrio.o \
- pngget.o \
- pngset.o
-
-
-JPEGOBJS = \
- jcomapi.o \
- jutils.o \
- jerror.o \
- jmemmgr.o \
- jmemnobs.o \
- jcapimin.o \
- jcapistd.o \
- jctrans.o \
- jcparam.o \
- jdatadst.o \
- jcinit.o \
- jcmaster.o \
- jcmarker.o \
- jcmainct.o \
- jcprepct.o \
- jccoefct.o \
- jccolor.o \
- jcsample.o \
- jchuff.o \
- jcphuff.o \
- jcdctmgr.o \
- jfdctfst.o \
- jfdctflt.o \
- jfdctint.o \
- jdapimin.o \
- jdapistd.o \
- jdtrans.o \
- jdatasrc.o \
- jdmaster.o \
- jdinput.o \
- jdmarker.o \
- jdhuff.o \
- jdphuff.o \
- jdmainct.o \
- jdcoefct.o \
- jdpostct.o \
- jddctmgr.o \
- jidctfst.o \
- jidctflt.o \
- jidctint.o \
- jidctred.o \
- jdsample.o \
- jdcolor.o \
- jquant1.o \
- jquant2.o \
- jdmerge.o
-
-TIFFOBJS = \
- tif_aux.o \
- tif_close.o \
- tif_codec.o \
- tif_compress.o \
- tif_dir.o \
- tif_dirinfo.o \
- tif_dirread.o \
- tif_dirwrite.o \
- tif_dumpmode.o \
- tif_error.o \
- tif_fax3.o \
- tif_fax3sm.o \
- tif_getimage.o \
- tif_jpeg.o \
- tif_flush.o \
- tif_lzw.o \
- tif_luv.o \
- tif_next.o \
- tif_open.o \
- tif_packbits.o \
- tif_pixarlog.o \
- tif_predict.o \
- tif_print.o \
- tif_read.o \
- tif_swab.o \
- tif_strip.o \
- tif_thunder.o \
- tif_tile.o \
- tif_unix.o \
- tif_version.o \
- tif_warning.o \
- tif_write.o \
- tif_zip.o
-
IODBCOBJS = \
catalog.o \
@@ -304,8 +180,11 @@
all: @WX_ALL@
-@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
+CREATE_LINKS: $(top_builddir)/lib/@WX_LIBRARY_NAME@
+
+CREATE_INSTALLED_LINKS: preinstall
+
+$(top_builddir)/lib/@WX_LIBRARY_NAME@: $(OBJECTS)
@$(INSTALL) -d ./lib
- $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
- $(RANLIB) ./lib/$@
+ ${LIBTOOL} --mode=link cc -o $(top_builddir)/lib/@WX_LIBRARY_NAME@ ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1
@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
@@ -314,52 +193,12 @@
$(RANLIB) ./lib/$@
-@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
- @$(INSTALL) -d ./lib
- $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
-
@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o
@$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
-CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
- @$(RM) ./lib/@WX_LIBRARY_LINK1@
- @$(RM) ./lib/@WX_LIBRARY_LINK2@
- @$(RM) ./lib/@WX_LIBRARY_LINK3@
- cd lib \
- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
-
-CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
- @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
- cd lib \
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
-
-CREATE_INSTALLED_LINKS: preinstall
- $(RM) $(libdir)/@WX_LIBRARY_LINK1@
- $(RM) $(libdir)/@WX_LIBRARY_LINK2@
- $(RM) $(libdir)/@WX_LIBRARY_LINK3@
- cd $(libdir) \
- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
-
-CREATE_INSTALLED_LINKS_GL: preinstall_gl
- $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
- cd $(libdir) \
- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
-
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
parser.o: parser.c lexer.c
- $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
+ ${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS) -o $@ parser.c
parser.c: $(COMMDIR)/parser.y lexer.c
@@ -393,24 +232,22 @@
# this is the real install target: copies the library, wx-config and the
# headers to the installation directory
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
+preinstall: $(top_builddir)/lib/@WX_LIBRARY_NAME@ $(top_builddir)/wx@TOOLKIT_NAME@-config
@echo " "
@echo " Installing wxWindows..."
@echo " "
- $(INSTALL) -d $(prefix)
- $(INSTALL) -d $(bindir)
- $(INSTALL) -d $(libdir)
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+ ${LIBTOOL} --mode=install ${INSTALL_DATA} $(top_builddir)/lib/@WX_LIBRARY_NAME@ ${libdir}
+
- $(INSTALL) -d $(libdir)/wx
- $(INSTALL) -d $(libdir)/wx/include
- $(INSTALL) -d $(libdir)/wx/include/wx
- $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+ $(INSTALL_DATA_DIR) $(libdir)/wx
+ $(INSTALL_DATA_DIR) $(libdir)/wx/include
+ $(INSTALL_DATA_DIR) $(libdir)/wx/include/wx
+ $(INSTALL_DATA_DIR) $(libdir)/wx/include/wx/@TOOLKIT_NAME@
$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
- $(INSTALL) -d $(includedir)/wx
+ $(INSTALL_DATA_DIR) $(includedir)/wx
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@@ -423,8 +260,8 @@
done
- $(INSTALL) -d $(localedir)
+ $(INSTALL_DATA_DIR) $(localedir)
@for p in $(WX_LINGUAS); do \
- $(INSTALL) -d $(localedir)/$$p; \
- $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+ $(INSTALL_DATA_DIR) $(localedir)/$$p; \
+ $(INSTALL_DATA_DIR) $(localedir)/$$p/LC_MESSAGES; \
$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
@@ -524,8 +361,4 @@
mkdir $(DISTDIR)/src
mkdir $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
- cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
# this target is the common part of distribution script for all GUI toolkits,
@@ -561,5 +394,4 @@
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
mkdir $(DISTDIR)/src/png
- mkdir $(DISTDIR)/src/jpeg
mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/iodbc
@@ -584,7 +416,4 @@
cp $(PNGDIR)/*.c $(DISTDIR)/src/png
cp $(PNGDIR)/README $(DISTDIR)/src/png
- cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
- cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
- cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
Reference in a new issue View git blame Copy permalink