diff options
| author | Thomas Gellekum <tg@FreeBSD.org> | 1997-11-19 12:18:07 +0000 |
|---|---|---|
| committer | Thomas Gellekum <tg@FreeBSD.org> | 1997-11-19 12:18:07 +0000 |
| commit | 9ff9802dd70d8601c66d4571abdfd6b6478fbfe8 (patch) | |
| tree | 37a818a45bb750a17f29aeb8b127c9fdff4cf1a4 /x11/libdnd | |
| parent | Make it install stuff in the right place. (diff) | |
Make `make reinstall' work. Build and install shared libraries.
Notes
Notes:
svn path=/head/; revision=8706
Diffstat (limited to 'x11/libdnd')
| -rw-r--r-- | x11/libdnd/Makefile | 4 | ||||
| -rw-r--r-- | x11/libdnd/files/patch-aa | 14 | ||||
| -rw-r--r-- | x11/libdnd/files/patch-ab | 53 | ||||
| -rw-r--r-- | x11/libdnd/pkg-plist | 3 |
4 files changed, 58 insertions, 16 deletions
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index b6aa87eaebba..2646b61a82f4 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -3,7 +3,7 @@ # Date created: 8 August 1997 # Whom: lukin@okbmei.msk.su # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1997/08/11 08:54:43 tg Exp $ # DISTNAME= dnd.1.1 @@ -16,7 +16,7 @@ MAINTAINER= lukin@okbmei.msk.su WRKSRC= ${WRKDIR}/DND/DNDlib GNU_CONFIGURE= yes -ALL_TARGET= libC libCpp +CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" post-install: .if !defined(NOPORTDOCS) diff --git a/x11/libdnd/files/patch-aa b/x11/libdnd/files/patch-aa index c5fb62abf52b..f7ddb8b2acb9 100644 --- a/x11/libdnd/files/patch-aa +++ b/x11/libdnd/files/patch-aa @@ -1,17 +1,3 @@ ---- Makefile.in.orig Fri May 23 06:18:22 1997 -+++ Makefile.in Fri Aug 8 20:11:37 1997 -@@ -29,9 +29,9 @@ - - install: libCpp libC - install -d $(INC_DIR) -- install DragAndDrop.h DragAndDropTypes.h $(INC_DIR) -+ install -m 644 DragAndDrop.h DragAndDropTypes.h $(INC_DIR) - install -d $(LIB_DIR) -- install libDnd.a libDnd++.a $(LIB_DIR) -+ install -m 644 libDnd.a libDnd++.a $(LIB_DIR) - - libC: libDnd.a - --- DragAndDrop.c.orig Mon Sep 15 21:02:20 1997 +++ DragAndDrop.c Mon Sep 15 21:03:53 1997 @@ -22,7 +22,12 @@ diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab new file mode 100644 index 000000000000..8a762934dbe7 --- /dev/null +++ b/x11/libdnd/files/patch-ab @@ -0,0 +1,53 @@ +--- Makefile.in.orig Fri May 23 04:18:22 1997 ++++ Makefile.in Wed Nov 19 13:11:44 1997 +@@ -23,20 +23,28 @@ + CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c + LINK = $(CC) $(LDFLAGS) -o $@ + ++SOCOMPILE= $(COMPILE) -fpic ++SOCXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c -fpic ++ + default: all + +-all: libC libCpp dndtest ++all: libC libCpp dndtest libC-so libCpp-so + + install: libCpp libC + install -d $(INC_DIR) +- install DragAndDrop.h DragAndDropTypes.h $(INC_DIR) ++ install -c -m 644 DragAndDrop.h DragAndDropTypes.h $(INC_DIR) + install -d $(LIB_DIR) +- install libDnd.a libDnd++.a $(LIB_DIR) ++ install -c -m 644 libDnd.a libDnd++.a $(LIB_DIR) ++ install -c libDnd.so.1.0 libDnd++.so.1.0 $(LIB_DIR) + + libC: libDnd.a + + libCpp: libDnd++.a + ++libC-so: libDnd.so.1.0 ++ ++libCpp-so: libDnd++.so.1.0 ++ + dndtest: dndtest.c libDnd.a + rm -f dndtest + $(COMPILE) dndtest.c +@@ -57,6 +65,16 @@ + $(AR) cru libDnd++.a DragAndDrop.o + $(RANLIB) libDnd++.a + +-clean: +- rm -f *.o *.cxx *.a dndtest *~ *bak ++libDnd.so.1.0: DragAndDrop.c ++ rm -f DragAndDrop.so ++ $(SOCOMPILE) -o DragAndDrop.so DragAndDrop.c ++ $(LD) -Bshareable -x -o libDnd.so.1.0 DragAndDrop.so + ++libDnd++.so.1.0: DragAndDrop.c ++ rm -f DragAndDrop.so DragAndDrop.cxx ++ ln -s DragAndDrop.c DragAndDrop.cxx ++ $(SOCXXCOMPILE) -o DragAndDrop.so DragAndDrop.cxx ++ $(LD) -Bshareable -x -o libDnd++.so.1.0 DragAndDrop.so ++ ++clean: ++ rm -f *.o *.so *.cxx *.a dndtest *~ *bak diff --git a/x11/libdnd/pkg-plist b/x11/libdnd/pkg-plist index f7f65e933b0f..24610efe6c04 100644 --- a/x11/libdnd/pkg-plist +++ b/x11/libdnd/pkg-plist @@ -2,6 +2,9 @@ include/OffiX/DragAndDrop.h include/OffiX/DragAndDropTypes.h lib/libDnd.a lib/libDnd++.a +lib/libDnd.so.1.0 +lib/libDnd++.so.1.0 +@exec ldconfig -m %B share/doc/libdnd/DND.dvi share/doc/libdnd/DNDa4.ps share/doc/libdnd/DNDletter.ps |