1998-07-16 19:15:34 +02:00
|
|
|
--- src/Makefile.in.orig Fri Apr 24 02:17:04 1998
|
|
|
|
|
+++ src/Makefile.in Thu Jul 16 11:32:33 1998
|
1998-07-15 16:15:59 +02:00
|
|
|
@@ -2,9 +2,9 @@
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
# ANSI C compiler
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
-CC = @CC@
|
|
|
|
|
-CFLAGS = @CFLAGS@
|
|
|
|
|
-LDFLAGS = @LDFLAGS@
|
1998-07-16 19:15:34 +02:00
|
|
|
+CC = $(LIBTOOL) cc
|
1998-07-15 16:15:59 +02:00
|
|
|
+CFLAGS = -O2
|
1998-07-16 19:15:34 +02:00
|
|
|
+LDFLAGS = $(EXECLIBS)
|
1998-07-15 16:15:59 +02:00
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
# ELF specific (Linux)
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
@@ -17,7 +17,7 @@
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
@@ -57,13 +57,13 @@
|
|
|
|
|
ELF_MINOR_VERSION = @slang_minor_version@#
|
|
|
|
|
|
|
|
|
|
CONFIG_H = config.h
|
|
|
|
|
-ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
|
1998-07-16 19:15:34 +02:00
|
|
|
+ALL_CFLAGS = -Dunix $(THIS_LIB_DEFINES)
|
1998-07-15 16:15:59 +02:00
|
|
|
ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
|
|
|
|
|
COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)
|
|
|
|
|
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#
|
1998-07-16 19:15:34 +02:00
|
|
|
@@ -72,7 +72,7 @@
|
|
|
|
|
|
|
|
|
|
ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
|
|
|
|
|
|
|
|
|
|
-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB)
|
|
|
|
|
+EXECLIBS = libslang.la $(TCAPLIB)
|
|
|
|
|
EXECDEPS = $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
|
|
|
|
|
OFILES = @PROGRAM_OFILES@
|
1998-07-15 16:15:59 +02:00
|
|
|
@@ -90,8 +90,8 @@
|
|
|
|
|
|
|
|
|
|
$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
|
|
|
|
|
-$(RM) $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
|
|
|
|
|
- $(RANLIB) $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
+ cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
|
|
|
|
|
+ -rpath $(PREFIX)/lib -version-info 1:2
|
|
|
|
|
@echo ""
|
|
|
|
|
@echo $(NORMAL_LIB) created in $(OBJDIR)
|
|
|
|
|
|
|
|
|
|
@@ -115,9 +115,7 @@
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
install: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB)
|
|
|
|
|
@echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir)
|
|
|
|
|
- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
|
|
|
|
|
- $(RANLIB) $(install_lib_dir)/$(NORMAL_LIB)
|
|
|
|
|
- chmod 644 $(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)
|
