head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.138
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.136
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.134
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.132
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.130
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.128
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.126
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.124
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.122
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.120
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.118
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.116
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.114
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.112
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.110
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.108
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.106
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.104
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.102
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.100
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.98
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.96
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.94
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.90
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.70
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.92
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.88
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.86
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.84
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.82
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.80
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.78
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.76
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.74
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.72
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.68
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.66
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.64
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.62
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.60
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.58
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.56
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.54
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.52
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.50
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.48
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.46
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.44
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.42
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.40
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.38
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.36
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.34
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.32
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.30
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.28
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.26
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.24
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.22
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.20
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.18
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.16
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.14
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.12
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.10
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.8
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.6
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.4
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.2
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.2.0.28
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.26
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.24
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.22
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.20
	pkgsrc-2008Q1:1.2.0.18
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.16
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.14
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.12
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.10
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.8
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.6
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.4
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.2
	pkgsrc-2006Q1-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2009.02.11.21.00.13;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2006.03.02.19.19.43;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2005.12.31.00.53.22;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to Metakit 2.4.9.7:
- better UTF8 support in file & property names
- bugfixes
- Python 2.5 support for 64bit platforms
@
text
@$NetBSD$

--- unix/Makefile.in.orig	2007-06-16 02:23:25.000000000 +0200
+++ unix/Makefile.in
@@@@ -36,8 +36,7 @@@@ tclsh = tclsh
 tclincludedir = @@TCL_INCLUDE_DIR@@
 tcllibdir = @@TCL_LIB_DIR@@
 
-CXX_FLAGS = @@CPPFLAGS@@ @@CXXFLAGS@@ @@MK_THREADS@@ @@SHLIB_CFLAGS@@ \
-		-I$(srcdir)/../include
+CXX_FLAGS = @@CPPFLAGS@@ @@CXXFLAGS@@ @@MK_THREADS@@ @@SHLIB_CFLAGS@@
 
 # Compiling without frame pointers can play tricks with exception handling
 # (e.g. in Mk4py).  This does not affect standard operation, *only* errors.
@@@@ -47,22 +46,24 @@@@ CXXFLAGS = $(CXX_FLAGS)
 #CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS)
 #CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS)
 
-CXX = @@CXX@@
+CXX = ${LIBTOOL} --mode=compile @@CXX@@
+CXXLD= ${LIBTOOL} --mode=link @@CXX@@
 INSTALL = @@INSTALL@@
 INSTALL_DATA = @@INSTALL_DATA@@
-INSTALL_PROGRAM = @@INSTALL_PROGRAM@@
+INSTALL_PROGRAM = ${LIBTOOL} --mode=install @@INSTALL_PROGRAM@@
 LIB_SUFFIX = @@LIB_SUFFIX@@
-SHLIB_SUFFIX = @@SHLIB_SUFFIX@@
-SHLIB_LD = @@SHLIB_LD@@
+SHLIB_SUFFIX = .la
+SHLIB_LD = ${LIBTOOL} --mode=link @@CXX@@ -rpath ${prefix}/lib
+SHLIB_LDPY = ${LIBTOOL} --mode=link @@CXX@@ -rpath ${PYSITELIB}
 SHLIB_FLAGS = @@SHLIB_FLAGS@@
 STRIP_FLAGS = @@STRIP_FLAGS@@
-LIBEXT = @@LIBEXT@@
+LIBEXT = .la
 EXEEXT = @@EXEEXT@@
 DESTDIR=
 
 #---------- Do not change, shorthand only
 
-CXX_SWITCHES      = $(CXXFLAGS) -I$(srcdir)/../src -I.
+CXX_SWITCHES      = $(CXXFLAGS) -I$(srcdir)/../include -I$(srcdir)/../src -I.
 CXX_SWITCHES_TCL  = $(CXXFLAGS) -I$(tclincludedir)/generic -I$(tclincludedir)
 CXX_SWITCHES_PY   = $(CXXFLAGS) -I$(srcdir)/../python/scxx -I$(pyincludedir)
 
@@@@ -74,7 +75,7 @@@@ core: Makefile libmk4$(LIBEXT) $(DEMOS)
 
 tcl: Makefile Mk4tcl$(LIBEXT)
 
-python: Makefile Mk4py$(LIBEXT)
+python: Makefile Mk4py.so
 
 test: Makefile libmk4$(LIBEXT) regress
 	test -d tests || mkdir tests
@@@@ -106,9 +107,9 @@@@ install-tcl: Mk4tcl$(LIBEXT)
 	if [ '${LIBEXT}' = '.a' ]; then ranlib $(DESTDIR)$(tcllibdir)/Mk4tcl/Mk4tcl.a; fi
 	echo 'package ifneeded Mk4tcl 2.4.9.7 [list load [file join $$dir Mk4tcl$(LIBEXT)] Mk4tcl]' >$(DESTDIR)$(tcllibdir)/Mk4tcl/pkgIndex.tcl
 
-install-python: Mk4py$(LIBEXT)
-	$(INSTALL_PROGRAM) Mk4py$(LIBEXT) $(DESTDIR)$(pylibdir)
-	$(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
+install-python: Mk4py.so
+	$(INSTALL_PROGRAM) Mk4py.so $(DESTDIR)$(pylibdir)
+	$(INSTALL_DATA) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
 
 clean:
 	rm -f *$(LIBEXT) *.o
@@@@ -133,8 +134,8 @@@@ libmk4$(LIB_SUFFIX): $(LOBJS)
 	ar rcu $@@ $(LOBJS)
 	ranlib $@@
 
-libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
+libmk4$(SHLIB_SUFFIX): $(LOBJS:.o=.lo) $(LINK_SPECIAL_FILES)
+	$(SHLIB_LD) -o $@@ $(LOBJS:.o=.lo) $(LINK_SPECIAL_FLAGS)
 
 Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
 	ar rcu $@@ mk4tcl.o mk4too.o $(LOBJS)
@@@@ -147,30 +148,34 @@@@ Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
 	ar cru $@@ $(PYOBJS) $(LOBJS)
 	ranlib $@@
 
-Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)
+Mk4py.so: $(PYOBJS:.o=.lo) $(LINK_SPECIAL_FILES)
+	$(SHLIB_LDPY) -o libMk4py.la $(PYOBJS:.o=.lo) $(LINK_SPECIAL_FLAGS) -L${prefix}/lib -lmk4
+	cp .libs/libMk4py.so $@@
 
 Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES)
 	$(SHLIB_LD) -o $@@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
 
-demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
-	$(CXX) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
-		$(srcdir)/../demos/demo.cpp libmk4$(LIBEXT) @@LIBS@@
+demo.lo dump.lo myio.lo: $(srcdir)/../demos/${@@:.lo=.cpp}
+	$(CXX) -c $(CXX_SWITCHES) $?
 
-dump: $(srcdir)/../demos/dump.cpp libmk4$(LIBEXT)
-	$(CXX) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
-		$(srcdir)/../demos/dump.cpp libmk4$(LIBEXT) @@LIBS@@
+demo: demo.lo libmk4$(LIBEXT)
+	$(CXXLD) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
+		demo.lo libmk4$(LIBEXT) @@LIBS@@
 
-myio: $(srcdir)/../demos/myio.cpp libmk4$(LIBEXT)
-	$(CXX) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
-		$(srcdir)/../demos/myio.cpp libmk4$(LIBEXT) @@LIBS@@
+dump: dump.lo libmk4$(LIBEXT)
+	$(CXXLD) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
+		dump.lo libmk4$(LIBEXT) @@LIBS@@
+
+myio: myio.lo libmk4$(LIBEXT)
+	$(CXXLD) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
+		myio.lo libmk4$(LIBEXT) @@LIBS@@
 
 struct: $(srcdir)/../demos/struct.cpp
 	$(CXX) $(CXX_SWITCHES) -o $@@$(EXEEXT) \
 		$(srcdir)/../demos/struct.cpp -lmk4 @@LIBS@@
 
-regress: $(TSTOBJS) libmk4$(LIBEXT)
-	$(CXX) $(CXX_SWITCHES) -o $@@$(EXEEXT) $(TSTOBJS) libmk4$(LIBEXT) @@LIBS@@
+regress: $(TSTOBJS:.o=.lo) libmk4$(LIBEXT)
+	$(CXXLD) $(CXX_SWITCHES) -o $@@$(EXEEXT) $(TSTOBJS:.o=.lo) libmk4$(LIBEXT) @@LIBS@@
 
 #---------- Dependencies
 
@@@@ -186,6 +191,9 @@@@ mk4tcl.o: $(srcdir)/../tcl/mk4tcl.cpp
 mk4too.o: $(srcdir)/../tcl/mk4too.cpp
 	$(CXX) -c $(CXX_SWITCHES_TCL) $?
 
+PyProperty.lo PyRowRef.lo PyStorage.lo PyView.lo: $(srcdir)/../python/${@@:.lo=.cpp}
+	$(CXX) -c $(CXX_SWITCHES_PY) $?
+
 PyProperty.o: $(srcdir)/../python/PyProperty.cpp
 	$(CXX) -c $(CXX_SWITCHES_PY) $?
 PyRowRef.o: $(srcdir)/../python/PyRowRef.cpp
@@@@ -195,7 +203,7 @@@@ PyStorage.o: $(srcdir)/../python/PyStora
 PyView.o: $(srcdir)/../python/PyView.cpp
 	$(CXX) -c $(CXX_SWITCHES_PY) $?
 
-PWOImp.o: $(srcdir)/../python/scxx/PWOImp.cpp \
+PWOImp.lo: $(srcdir)/../python/scxx/PWOImp.cpp \
 	  $(srcdir)/../python/scxx/PWOBase.h \
 	  $(srcdir)/../python/scxx/PWOCallable.h \
 	  $(srcdir)/../python/scxx/PWOMSequence.h \
@@@@ -204,6 +212,9 @@@@ PWOImp.o: $(srcdir)/../python/scxx/PWOIm
 	  $(srcdir)/../python/scxx/PWOSequence.h
 	$(CXX) -c $(CXX_SWITCHES_PY) $(srcdir)/../python/scxx/PWOImp.cpp
 
+$(LOBJS:.o=.lo): $(srcdir)/../src/${@@:.lo=.cpp}
+	$(CXX) -c $(CXX_SWITCHES) $?
+
 column.o:  $(srcdir)/../src/column.cpp
 	$(CXX) -c $(CXX_SWITCHES) $?
 custom.o:  $(srcdir)/../src/custom.cpp
@@@@ -240,6 +251,9 @@@@ viewx.o:   $(srcdir)/../src/viewx.cpp
 mk4lua.o:  $(srcdir)/../lua/mk4lua.cpp
 	$(CXX) -c $(CXX_SWITCHES) $?
 
+$(TSTOBJS:.o=.lo): $(srcdir)/../tests/${@@:.lo=.cpp}
+	$(CXX) -c $(CXX_SWITCHES) $?
+
 regress.o: $(srcdir)/../tests/regress.cpp
 	$(CXX) -c $(CXX_SWITCHES) $?
 tbasic1.o: $(srcdir)/../tests/tbasic1.cpp
@


1.2
log
@update to 2.4.9.5
changes: fixes and optimizations
(they removed libtool support, so I had to patch this in again)
@
text
@d3 1
a3 1
--- unix/Makefile.in.orig	2005-11-22 20:12:28.000000000 +0100
d57 1
a57 1
 	echo 'package ifneeded Mk4tcl 2.4.9.5 [list load [file join $$dir Mk4tcl$(LIBEXT)] Mk4tcl]' >$(DESTDIR)$(tcllibdir)/Mk4tcl/pkgIndex.tcl
@


1.1
log
@Add DragonFly support. Add -rpath argument and let libtool generate
a shared library, otherwise other parts of the Makefile gets confused.
@
text
@d3 1
a3 1
--- unix/Makefile.in.orig	2005-12-30 18:07:35.000000000 +0000
d5 3
a7 1
@@@@ -147,7 +147,7 @@@@ $(srcdir)/configure: $(srcdir)/configure
d9 3
a11 4
 libmk4.la: $(LOBJS) $(LINK_SPECIAL_FILES)
 	$L --mode=link $(CXX) -o $@@ $(CXX_SWITCHES) $(LIBTOOL_SHLIB_FLAGS) \
-		-avoid-version $(SHLOBJS) $(LINK_SPECIAL_FLAGS)
+		-avoid-version -rpath $(libdir) $(SHLOBJS) $(LINK_SPECIAL_FLAGS)
d13 153
a165 2
 Mk4tcl@@SHLIB_SUFFIX@@: libmk4tcl.la
 	cp .libs/libmk4tcl@@SHLIB_SUFFIX@@ $@@
@