2000-06-29 01:18:30 +02:00
|
|
|
$NetBSD: patch-aa,v 1.12 2000/06/28 23:18:30 wiz Exp $
|
1998-08-07 12:35:47 +02:00
|
|
|
|
2000-06-29 01:18:30 +02:00
|
|
|
--- src/Makefile.in.orig Sun Apr 23 05:57:42 2000
|
|
|
|
|
+++ src/Makefile.in Thu Jun 29 01:06:01 2000
|
1998-07-15 16:15:59 +02:00
|
|
|
@@ -2,9 +2,9 @@
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
# ANSI C compiler
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
-CC = @CC@
|
1999-06-18 00:57:23 +02:00
|
|
|
+CC = $(LIBTOOL) @CC@
|
|
|
|
|
CFLAGS = @CFLAGS@
|
|
|
|
|
-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
|
1998-07-16 19:15:34 +02:00
|
|
|
+LDFLAGS = $(EXECLIBS)
|
1999-06-18 00:57:23 +02:00
|
|
|
#-----------------------------------------------------------------------------
|
|
|
|
|
# System library that contains functions for dynamic linking (-ldl)
|
|
|
|
|
#-----------------------------------------------------------------------------
|
|
|
|
|
@@ -22,7 +22,7 @@
|
1998-07-15 16:15:59 +02:00
|
|
|
# Set these values to ABSOLUTE path names
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
SRCDIR = @SRCDIR@# Location of sources
|
|
|
|
|
-OBJDIR = @OBJDIR@# Location of objects
|
|
|
|
|
+OBJDIR = .# Location of objects
|
|
|
|
|
ELFDIR = @ELFDIR@# Location of elf objects
|
|
|
|
|
|
|
|
|
|
#---------------------------------------------------------------------------
|
1999-09-20 20:43:58 +02:00
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
|
install_lib_dir = @libdir@
|
|
|
|
|
install_include_dir = @includedir@
|
|
|
|
|
-install_doc_dir = $(prefix)/doc/slang/@slang_version@
|
|
|
|
|
+install_doc_dir = $(prefix)/share/doc/slang
|
|
|
|
|
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
# Misc commands (safe to leave these untouched)
|
2000-01-01 18:17:56 +01:00
|
|
|
@@ -69,7 +69,7 @@
|
1998-07-15 16:15:59 +02:00
|
|
|
ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS)
|
|
|
|
|
ELF_LINK_CMD = @ELF_LINK_CMD@
|
|
|
|
|
|
|
|
|
|
-NORMAL_LIB = lib$(THIS_LIB).a
|
|
|
|
|
+NORMAL_LIB = lib$(THIS_LIB).la
|
|
|
|
|
OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
|
|
|
|
|
|
|
|
|
|
ELFLIB = lib$(THIS_LIB).so#
|
1999-09-20 20:43:58 +02:00
|
|
|
@@ -78,7 +78,7 @@
|
1998-07-16 19:15:34 +02:00
|
|
|
|
|
|
|
|
ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
|
|
|
|
|
|
1999-06-18 00:57:23 +02:00
|
|
|
-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB)
|
1998-07-16 19:15:34 +02:00
|
|
|
+EXECLIBS = libslang.la $(TCAPLIB)
|
|
|
|
|
EXECDEPS = $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
|
|
|
|
|
OFILES = @PROGRAM_OFILES@
|
2000-01-01 18:17:56 +01:00
|
|
|
@@ -94,13 +94,12 @@
|
1998-07-16 21:07:46 +02:00
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
# Rules
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
|
|
|
|
|
+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
|
1998-07-15 16:15:59 +02:00
|
|
|
|
|
|
|
|
$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
|
2000-01-01 18:17:56 +01:00
|
|
|
- -$(RM) $(OBJDIR_NORMAL_LIB)
|
1998-07-15 16:15:59 +02:00
|
|
|
- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
|
|
|
|
|
- $(RANLIB) $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
+ cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
|
2000-06-29 01:18:30 +02:00
|
|
|
+ -rpath $(PREFIX)/lib -lm -ltermcap -version-info 1:4
|
1998-07-15 16:15:59 +02:00
|
|
|
@echo ""
|
|
|
|
|
@echo $(NORMAL_LIB) created in $(OBJDIR)
|
|
|
|
|
|
2000-01-01 18:17:56 +01:00
|
|
|
@@ -125,8 +124,7 @@
|
1999-09-20 20:43:58 +02:00
|
|
|
install: install_basic_lib install_docs
|
|
|
|
|
install_basic_lib: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB)
|
1998-07-15 16:15:59 +02:00
|
|
|
@echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir)
|
|
|
|
|
- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
|
|
|
|
|
- $(RANLIB) $(install_lib_dir)/$(NORMAL_LIB)
|
|
|
|
|
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
|
|
|
|
|
@echo installing slang.h and slcurses.h in $(install_include_dir)
|
|
|
|
|
$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
|
|
|
|
|
$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)
|
