- repsect CXX and CXXFLAGS

- convert patch to unified diff
- install sample image
This commit is contained in:
brad 1999-10-02 21:48:27 +00:00
parent 9b152eb6b9
commit 32a1a9f3fd
4 changed files with 35 additions and 46 deletions

View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.2 1998/11/09 01:49:59 marc Exp $
#
# $OpenBSD: Makefile,v 1.3 1999/10/02 21:48:27 brad Exp $
DISTNAME= xjig-2.4
CATEGORIES= games
MAINTAINER= angelos@openbsd.org
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
EXTRACT_SUFX= .tgz
MAINTAINER= angelos@openbsd.org
MAKEFILE= Makefile.Linux
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/xjig ${PREFIX}/bin/xjig
@ ${INSTALL_MAN} ${WRKSRC}/xjig.man ${PREFIX}/man/man1/xjig.1
@${MKDIR} ${PREFIX}/share/xjig
${INSTALL_PROGRAM} ${WRKSRC}/xjig ${PREFIX}/bin/xjig
${INSTALL_MAN} ${WRKSRC}/xjig.man ${PREFIX}/man/man1/xjig.1
${INSTALL_DATA} ${WRKSRC}/tina.gif ${PREFIX}/share/xjig
.include <bsd.port.mk>

View File

@ -1,36 +1,26 @@
*** Makefile.Linux.orig Thu Jul 18 04:10:55 1996
--- Makefile.Linux Wed Sep 17 03:51:48 1997
***************
*** 1,7 ****
### compiler section
CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return
! CXXFLAGS = -g -DUSE_MIT_SHM
### default file to be used, when no options are set
--- 1,7 ----
### compiler section
CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return
! CXXFLAGS += -DUSE_MIT_SHM -I${X_INCLUDE}
### default file to be used, when no options are set
*************** LDFLAGS = -L$(XLIB_DIR)
*** 20,26 ****
.SUFFIXES: .C .o
.C.o:
! $(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $<
LD = $(CXX)
--- 20,26 ----
.SUFFIXES: .C .o
.C.o:
! $(CXX) $(CXXFLAGS) -c $<
LD = $(CXX)
--- Makefile.Linux.orig Wed Jul 17 16:10:55 1996
+++ Makefile.Linux Sat Oct 2 17:35:30 1999
@@ -1,11 +1,11 @@
### compiler section
-CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return
-CXXFLAGS = -g -DUSE_MIT_SHM
+#CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return
+CXXFLAGS += -Wall -fstrength-reduce -fpcc-struct-return -DUSE_MIT_SHM -I${X_INCLUDE}
### default file to be used, when no options are set
-JIG_DEFAULT = \"tina.gif\"
+JIG_DEFAULT = \"${PREFIX}/share/xjig/tina.gif\"
### Directories for include files of X11 and libraries
@@ -20,7 +20,7 @@
.SUFFIXES: .C .o
.C.o:
- $(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $<
+ $(CXX) $(CXXFLAGS) -c $<
LD = $(CXX)

View File

@ -2,6 +2,3 @@
screen as close as possible. Gif-images can be loaded and sliced
into pieces and as in every jigsaw puzzle, the goal is to
set the parts together again.
- Vanilla
vanilla@MinJe.com.TW

View File

@ -1,2 +1,4 @@
bin/xjig
man/man1/xjig.1
share/xjig/tina.gif
@dirrm share/xjig