1999-05-31 04:57:17 +00:00
|
|
|
--- Makefile.orig Sun Jul 5 11:52:26 1998
|
|
|
|
+++ Makefile Sun May 30 21:07:36 1999
|
1998-10-01 06:09:03 +00:00
|
|
|
@@ -1,14 +1,17 @@
|
1999-05-31 04:57:17 +00:00
|
|
|
# $Id: Makefile,v 1.4 1998/07/05 16:52:26 sverrehu Exp $
|
1998-10-01 06:09:03 +00:00
|
|
|
DIST = shhcards
|
1998-09-28 02:09:00 +00:00
|
|
|
VERMAJ = 1
|
1998-10-01 06:09:03 +00:00
|
|
|
-VERMIN = 0
|
1999-05-01 02:22:54 +00:00
|
|
|
-VERPAT = 4
|
1998-09-28 02:09:00 +00:00
|
|
|
-VERSION = $(VERMAJ).$(VERMIN).$(VERPAT)
|
1998-10-01 06:09:03 +00:00
|
|
|
+VERMIN = 1
|
1998-09-28 02:09:00 +00:00
|
|
|
+ifeq ($(PORTOBJFORMAT),elf)
|
|
|
|
+VERSION = $(VERMAJ)
|
|
|
|
+else
|
|
|
|
+VERSION = $(VERMAJ).$(VERMIN)
|
|
|
|
+endif
|
|
|
|
|
1998-05-02 18:02:44 +00:00
|
|
|
###########################################################################
|
|
|
|
|
|
|
|
# Define SHARED as 1 for Linux shared ELF library
|
|
|
|
-#SHARED = 1
|
|
|
|
+SHARED = 1
|
|
|
|
|
|
|
|
ifeq ($(SHARED),1)
|
|
|
|
LIBTARGET = lib$(DIST).so.$(VERSION)
|
1998-10-01 06:09:03 +00:00
|
|
|
@@ -28,8 +31,8 @@
|
1998-05-02 18:02:44 +00:00
|
|
|
INSTALL = install -m 644
|
|
|
|
MKDIRP = install -d -m 755
|
|
|
|
|
|
|
|
-CC = gcc
|
|
|
|
-OPTIM = -O2
|
|
|
|
+#CC = gcc
|
|
|
|
+OPTIM = $(CFLAGS)
|
|
|
|
|
|
|
|
###########################################################################
|
|
|
|
|
1999-05-31 04:57:17 +00:00
|
|
|
@@ -68,10 +71,10 @@
|
|
|
|
endif
|
|
|
|
|
|
|
|
# Alpha at USIT
|
|
|
|
-ifeq ($(HOSTTYPE),alpha)
|
|
|
|
-INCDIR = -I. -I/usr/include/X11 -I/usr/local/X11R5/include
|
|
|
|
-LIBDIR = -L. -L/usr/lib/X11 -L/usr/local/X11R5/lib
|
|
|
|
-endif
|
|
|
|
+#ifeq ($(HOSTTYPE),alpha)
|
|
|
|
+#INCDIR = -I. -I/usr/include/X11 -I/usr/local/X11R5/include
|
|
|
|
+#LIBDIR = -L. -L/usr/lib/X11 -L/usr/local/X11R5/lib
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
###########################################################################
|
|
|
|
|
1998-10-01 06:09:03 +00:00
|
|
|
@@ -87,7 +90,11 @@
|
1998-05-02 18:02:44 +00:00
|
|
|
|
|
|
|
$(LIBTARGET): $(LIBOBJS)
|
|
|
|
ifeq ($(SHARED),1)
|
|
|
|
- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
|
1998-09-28 02:09:00 +00:00
|
|
|
+ifeq ($(PORTOBJFORMAT),elf)
|
1999-01-10 17:21:34 +00:00
|
|
|
+ $(CC) -shared -Wl,-soname,$(LIBTARGET) -o $(LIBTARGET) $(LIBOBJS)
|
1998-09-28 02:09:00 +00:00
|
|
|
+else
|
1998-05-02 18:02:44 +00:00
|
|
|
+ $(CC) -shared -o $(LIBTARGET) $(LIBOBJS)
|
1998-09-28 02:09:00 +00:00
|
|
|
+endif
|
1998-05-02 18:02:44 +00:00
|
|
|
else
|
|
|
|
ar rcs $(LIBTARGET) $(LIBOBJS)
|
|
|
|
endif
|