$NetBSD: patch-ab,v 1.9 2003/09/04 13:07:01 adam Exp $ --- Makefile.in.orig 2003-01-05 12:54:59.000000000 +0100 +++ Makefile.in @@ -21,13 +21,13 @@ include ./src/make.env .SUFFIXES: .o .c .cpp .cxx .rsrc .r .c.o: - $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< + ${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) -o $@ $< .cpp.o: - $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< + ${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $< .cxx.o: - $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< + ${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $< .rsrc.r: $(DEREZ) $^ Carbon.r -useDF > $@ @@ -42,10 +42,6 @@ VP2 = @top_srcdir@/src/common VP3 = @top_srcdir@/src/generic VP4 = @top_srcdir@/src/unix VP5 = @top_srcdir@/src/html -VP6 = @top_srcdir@/src/png -VP7 = @top_srcdir@/src/jpeg -VP8 = @top_srcdir@/src/tiff -VP9 = @top_srcdir@/src/zlib VPA = @top_srcdir@/src/regex VP10 = @top_srcdir@/src/iodbc VP11 = @top_srcdir@/src/msw/ole @@ -53,7 +49,7 @@ VP11 = @top_srcdir@/src/msw/ole # the comment at the end of the next line is needed because otherwise autoconf # 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@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf +VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -64,7 +60,7 @@ libdir = @libdir@ mandir = @mandir@ includedir = @includedir@ -localedir = $(datadir)/locale +localedir = /usr/orinoco/share/locale top_builddir = . build_libdir = $(top_builddir)/lib @@ -72,7 +68,8 @@ build_libdir = $(top_builddir)/lib INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL@ +INSTALL_DATA_DIR = ${BSD_INSTALL_DATA_DIR} +INSTALL_SCRIPT = @INSTALL_SCRIPT@ build_alias = @build_alias@ build_triplet = @build@ @@ -94,10 +91,6 @@ GENDIR = $(WXDIR)/src/generic COMMDIR = $(WXDIR)/src/common HTMLDIR = $(WXDIR)/src/html UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -TIFFDIR = $(WXDIR)/src/tiff -ZLIBDIR = $(WXDIR)/src/zlib REGEXDIR = $(WXDIR)/src/regex GTKDIR = $(WXDIR)/src/gtk X11DIR = $(WXDIR)/src/x11 @@ -161,124 +154,6 @@ REGEXOBJS = \ regerror.o \ regfree.o -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 \ - pngerror.o \ - pnggccrd.o \ - pngget.o \ - pngmem.o \ - pngpread.o \ - pngread.o \ - pngrio.o \ - pngrtran.o \ - pngrutil.o \ - pngset.o \ - pngtrans.o \ - pngvcrd.o \ - pngwio.o \ - pngwrite.o \ - pngwtran.o \ - pngwutil.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 \ connect.o \ @@ -302,52 +177,33 @@ IODBCOBJS = \ SONAME_FLAGS = @SONAME_FLAGS@ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@ -all: @WX_ALL@ +all: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la -$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) - @$(INSTALL) -d $(build_libdir) - @$(RM) $@ - $(AR) $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ +$(build_libdir)/lib@WX_LIBRARY_BASENAME@.la: $(OBJECTS) + @$(INSTALL_DATA_DIR) $(build_libdir) + ${LIBTOOL} --mode=link cc -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1 $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o - @$(INSTALL) -d $(build_libdir) + @$(INSTALL_DATA_DIR) $(build_libdir) @$(RM) $@ $(AR) $(AROPTIONS) $@ glcanvas.o $(RANLIB) $@ -$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) - @$(INSTALL) -d $(build_libdir) - $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) - # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line # but this seems to result in problems with libwx_gtk being linked in twice $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ - @$(INSTALL) -d $(build_libdir) + @$(INSTALL_DATA_DIR) $(build_libdir) $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES) - @$(INSTALL) -d $(build_libdir) + @$(INSTALL_DATA_DIR) $(build_libdir) $(RESCOMP) -d __UNIX__ -useDF $^ -o $@ -$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ - cd $(build_libdir) \ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ - -$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(build_libdir) \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ - $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h parser.o: parser.c lexer.c $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c + ${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c parser.c: $(COMMDIR)/parser.y lexer.c $(YACC) $(COMMDIR)/parser.y @@ -369,13 +225,6 @@ lexer.c: $(COMMDIR)/lexer.l @IF_GNU_MAKE@-include $(OBJECTS:.o=.d) -CREATE_INSTALLED_LINKS: preinstall - $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - cd $(libdir) \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ - CREATE_INSTALLED_LINKS_GL: preinstall_gl $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ @@ -385,10 +234,10 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl afminstall: preinstall @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi - $(INSTALL) -d $(datadir)/wx - $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) - $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm - $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm + $(INSTALL_DATA_DIR) $(datadir)/wx + $(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN) + $(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN)/afm + $(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN)/gs_afm $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm @@ -410,51 +259,51 @@ win32install: preinstall # this is the real install target: copies the library, wx-config and the # headers to the installation directory -preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config +preinstall: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(top_builddir)/wx@TOOLCHAIN_NAME@-config @echo " " @echo " Installing wxWindows..." @echo " " - @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi - @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi - @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + @if test ! -d $(prefix); then $(INSTALL_DATA_DIR) $(prefix); fi + @if test ! -d $(bindir); then $(INSTALL_DATA_DIR) $(bindir); fi + @if test ! -d $(libdir); then $(INSTALL_DATA_DIR) $(libdir); fi $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config - @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + ${LIBTOOL} --mode=install ${INSTALL_DATA} $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(libdir) @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi - $(INSTALL) -d $(libdir)/wx - $(INSTALL) -d $(libdir)/wx/include - $(INSTALL) -d $(libdir)/wx/include/univ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx + $(INSTALL_DATA_DIR) $(libdir)/wx + $(INSTALL_DATA_DIR) $(libdir)/wx/include + $(INSTALL_DATA_DIR) $(libdir)/wx/include/univ + $(INSTALL_DATA_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@ + $(INSTALL_DATA_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h - $(INSTALL) -d $(includedir)/wx + $(INSTALL_DATA_DIR) $(includedir)/wx @# FIXME: This will erroneously install a wx/base dir for wxBase.. - @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 - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi - @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi + @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/@TOOLKIT_DIR@; fi + @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/html; fi + @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/generic; fi + @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/univ; fi + @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL_DATA_DIR) $(includedir)/wx/msw/ole; fi @# always install msw headers for wxBase, it's much simpler - @if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi + @if test "$(USE_GUI)" = 0; then $(INSTALL_DATA_DIR) $(includedir)/wx/msw; fi - $(INSTALL) -d $(includedir)/wx/protocol - $(INSTALL) -d $(includedir)/wx/unix + $(INSTALL_DATA_DIR) $(includedir)/wx/protocol + $(INSTALL_DATA_DIR) $(includedir)/wx/unix @list='$(HEADERS)'; for p in $$list; do \ $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ done - @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi + @if test ! -d $(localedir); then $(INSTALL_DATA_DIR) $(localedir); fi @for p in $(WX_LINGUAS); do \ - if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\ - if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\ + if test ! -d $(localedir)/$$p; then $(INSTALL_DATA_DIR) $(localedir)/$$p; fi;\ + if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL_DATA_DIR) $(localedir)/$$p/LC_MESSAGES; fi;\ $(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"; \ done @@ -474,7 +323,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGE @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ -install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ +install: @AFMINSTALL@ m4datainstall @WIN32INSTALL@ @echo " " @echo " The installation of wxWindows is finished. On certain" @echo " platforms (e.g. Linux) you'll now have to run ldconfig"