From f878f5b14ac474701735897135107cb2bf4ffe4e Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Tue, 27 Aug 1991 05:24:37 +0000
Subject: [PATCH] Cosmetic changes.
---
Makefile | 5 ++---
scripts/Makefile | 7 ++++++-
src/Makefile | 2 +-
src/include/server/Makefile | 2 +-
src/libraries/Makefile | 2 +-
src/libraries/libansi/Makefile | 5 ++---
src/libraries/libmisc/ChangeLog | 4 ++++
src/libraries/libmisc/Makefile | 4 ++--
src/libraries/libmisc/pom.c | 3 ++-
src/server/Makefile | 4 ++--
10 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 892e715c9..8377be37d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@ includes:
libraries:
- -$(RM) -r $(LIBDIR)
- mkdir $(LIBDIR)
+ -mkdir $(LIBDIR)
for i in $(SUBDIRS) ; \
do \
echo making libraries in directory $$i; \
@@ -51,7 +50,7 @@ depend: includes
clean:
- rm -vf *~ core
+ $(RM) *~ core
for i in $(SUBDIRS); \
do \
echo making clean in directory $$i; \
diff --git a/scripts/Makefile b/scripts/Makefile
index a2a2933e9..6da10fa0a 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,3 +1,8 @@
+TOPDIR = /usr/lyskom
+SCRIPTDIR = $(TOPDIR)/scripts
+
+include $(SCRIPTDIR)/import.make
+
all:;
depend:;
install:;
@@ -7,4 +12,4 @@ binaries:;
clean:
- rm -vf *~ core
+ $(RM) *~ core
diff --git a/src/Makefile b/src/Makefile
index 850c5a965..bdeabed4a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,7 +51,7 @@ depend:
clean:
- rm -vf *~ core
+ $(RM) *~ core
for i in $(SUBDIRS); \
do \
echo making clean in directory $$i; \
diff --git a/src/include/server/Makefile b/src/include/server/Makefile
index 2dd23253c..29b539d16 100644
--- a/src/include/server/Makefile
+++ b/src/include/server/Makefile
@@ -22,6 +22,6 @@ includes:
done
clean:
- rm -vf ${OBJECTS} *~ core temp-Makefile Distfile *.o
+ $(RM) ${OBJECTS} *~ core temp-Makefile Distfile *.o
depend:;
diff --git a/src/libraries/Makefile b/src/libraries/Makefile
index ecfd9208e..3cc5db29f 100644
--- a/src/libraries/Makefile
+++ b/src/libraries/Makefile
@@ -47,7 +47,7 @@ install:
clean:
- rm -vf *~ core
+ $(RM) *~ core
for i in $(SUBDIRS); \
do \
echo making clean in directory $$i; \
diff --git a/src/libraries/libansi/Makefile b/src/libraries/libansi/Makefile
index 6b4cea901..db1a7b19c 100644
--- a/src/libraries/libansi/Makefile
+++ b/src/libraries/libansi/Makefile
@@ -12,8 +12,7 @@ LIBOBJS = strerror.o
all: $(LIBNAME)
libmisc.a: $(LIBOBJS)
- rm -f $(LIBNAME)
- ar qc $(LIBNAME) $(LIBOBJS)
+ $(AR) $(ARFLAGS) $(LIBNAME) $?
ranlib $(LIBNAME)
includes:;
@@ -26,7 +25,7 @@ libraries: $(LIBNAME)
binaries:;
clean:
- rm -vf ${LIBOBJS} *~ core temp-Makefile Distfile *.o
+ $(RM) ${LIBOBJS} *~ core temp-Makefile Distfile *.o
# Recreate the Makefile
diff --git a/src/libraries/libmisc/ChangeLog b/src/libraries/libmisc/ChangeLog
index ddcda9fdb..55adb3952 100644
--- a/src/libraries/libmisc/ChangeLog
+++ b/src/libraries/libmisc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 27 07:20:34 1991 Per Cederqvist (ceder at lysator)
+
+ * pom.c: Tog bort variablerna ts och pmt som inte anv{nds.
+
Sat Jul 6 05:43:41 1991 Per Cederqvist (ceder at lysator)
* Fullbordade {ndringen fr}n char till unsigned char i
diff --git a/src/libraries/libmisc/Makefile b/src/libraries/libmisc/Makefile
index ed18a2d1f..cd4627ab6 100644
--- a/src/libraries/libmisc/Makefile
+++ b/src/libraries/libmisc/Makefile
@@ -29,7 +29,7 @@ INSTALL-HDRS = pom.h s-collat-tabs.h s-string.h zmalloc.h
all: $(LIBNAME)
$(LIBNAME): $(LIBOBJS)
- ar r $(LIBNAME) $?
+ $(AR) $(ARFLAGS) $(LIBNAME) $?
ranlib $(LIBNAME)
libraries: $(LIBNAME)
@@ -50,7 +50,7 @@ testnumlist: testnumlist.o numlist.o
clean:
- rm -vf ${OBJECTS} *~ core temp-Makefile Distfile *.o
+ $(RM) ${OBJECTS} *~ core temp-Makefile Distfile *.o
# Recreate the Makefile
diff --git a/src/libraries/libmisc/pom.c b/src/libraries/libmisc/pom.c
index 41e8d4c78..4b26fb243 100644
--- a/src/libraries/libmisc/pom.c
+++ b/src/libraries/libmisc/pom.c
@@ -19,7 +19,9 @@
#define RADS (M_PI/180.0)
+#if 0
static char * pmt[] = { "NM", "FQ", "FM", "LQ" };
+#endif
static short ix;
static double m; /* Sun's Mean Anomaly */
static double mp; /* Moon's Mean Anomaly */
@@ -142,7 +144,6 @@ phase_of_the_moon (struct tm * when)
{
int p1, p2, p3, p4;
char sgn;
- long ts;
double tmp;
struct pom result;
diff --git a/src/server/Makefile b/src/server/Makefile
index be1782a82..d4179aaca 100755
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -126,12 +126,12 @@ install: $(PROGRAMS)
# Don't strip ramkomd - we want debugging info!
clean:
- rm -vf *.o *~ core $(PROGRAMS) $(SPECIALS) TAGS
+ $(RM) *.o *~ core $(PROGRAMS) $(SPECIALS) TAGS
specials: $(SPECIALS)
tags: $(SRCS) $(HDRS)
- rm -f TAGS
+ $(RM) TAGS
etags -t $(INCLUDEDIR)/*.h *.[hc]
include $(SCRIPTDIR)/Parallell-depend.make
--
GitLab