$NetBSD: patch-Garlic_Makefile.in,v 1.0 2024/12/05 15:00:00 dkazankov Exp $

Remove duplicate spec
Remove "old" stream attributes implementation
Remove unsupported Shared_Passive specification
Make install aware of DESTDIR
Copy project file to lib/gnat
Remove all "inlining" staff

--- Garlic/Makefile.in.orig	2007-11-26 15:10:13.000000000 +0200
+++ Garlic/Makefile.in
@@ -187,7 +187,6 @@
 $(srcdir)/s-gptcse.ads $(srcdir)/s-gptcse.adb
 
 COMMONOBJECTS = \
-s-dsaser.o\
 s-galiop.o\
 s-ganata.o\
 s-ganeut.o\
@@ -229,18 +228,16 @@
 s-rpc.o\
 s-rpcser.o\
 s-rpstio.o\
-s-shasto.o\
-s-stratt.o
+s-shasto.o
 
 COMMONSOURCES = \
-$(srcdir)/s-dsaser.ads                        \
-          s-galiop.ads                        \
+$(srcdir)/s-galiop.ads                        \
 $(srcdir)/s-ganata.ads $(srcdir)/s-ganata.adb \
 $(srcdir)/s-ganeut.ads $(srcdir)/s-ganeut.adb \
 $(srcdir)/s-ganota.ads $(srcdir)/s-ganota.adb \
 $(srcdir)/s-gaphlo.ads $(srcdir)/s-gaphlo.adb \
-          s-gaplsp.ads                        \
-$(srcdir)/s-gaprco.ads           s-gaprco.adb \
+$(srcdir)/s-gaplsp.ads                        \
+$(srcdir)/s-gaprco.ads $(srcdir)/s-gaprco.adb \
 $(srcdir)/s-gaprre.ads $(srcdir)/s-gaprre.adb \
 $(srcdir)/s-gardeb.ads $(srcdir)/s-gardeb.adb \
 $(srcdir)/s-garexc.ads $(srcdir)/s-garexc.adb \
@@ -253,7 +250,7 @@
 $(srcdir)/s-garpri.ads $(srcdir)/s-garpri.adb \
 $(srcdir)/s-gaprma.ads $(srcdir)/s-gaprma.adb \
 $(srcdir)/s-garpro.ads $(srcdir)/s-garpro.adb \
-$(srcdir)/s-garrem.ads           s-garrem.adb \
+$(srcdir)/s-garrem.ads $(srcdir)/s-garrem.adb \
 $(srcdir)/s-garsta.ads $(srcdir)/s-garsta.adb \
 $(srcdir)/s-garstr.ads $(srcdir)/s-garstr.adb \
 $(srcdir)/s-gartas.ads $(srcdir)/s-gartas.adb \
@@ -275,8 +272,7 @@
 $(srcdir)/s-rpc.ads    $(srcdir)/s-rpc.adb    \
 $(srcdir)/s-rpcser.ads $(srcdir)/s-rpcser.adb \
 $(srcdir)/s-rpstio.ads $(srcdir)/s-rpstio.adb \
-$(srcdir)/s-shasto.ads $(srcdir)/s-shasto.adb \
-$(srcdir)/s-stratt.adb
+                       $(srcdir)/s-shasto.adb
 
 OBJECTS = \
 $(PROTOCOLSOBJECTS) \
@@ -286,7 +282,7 @@
 SOURCES = $(PROTOCOLSSOURCES) $(FILTERSSOURCES) $(COMMONSOURCES)
 CLEANFILES = lib*.a *.ali *.o b_*.c b~*.ad[bs]\
 	s-gaprco.adb s-galiop.ads\
-	inlining gnatlib/* constants_nodef\
+	gnatlib/* constants_nodef\
 	isthrbio$(EXEEXT)\
 	$(FILTERSOBJECTS)
 
@@ -501,39 +497,14 @@
 	-rm -fr bldtool
 
 install-dirs-local:
-	-rm -rf $(GARLIC)
-	-$(mkinstalldirs) $(GARLIC)
-	@echo $(GARLIC) created
-
-inlining: all-local
-	rm -rf gnatlib >/dev/null 2>&1;\
-	mkdir gnatlib >/dev/null 2>&1;\
-	gnatlibdir=`$(srcdir)/../Dist/config.sdefault $(GNAT_RTS_FLAG)`;\
-	(cd $$gnatlibdir && grep -l "D s-stratt.adb" *.ali)\
-	| $(SED) 's,\.ali$$,.o,' > gnatlib/tocheck;\
-	for i in $(OBJECTS); do\
-	   echo "Checking $$i";\
-	   mv gnatlib/tocheck gnatlib/tocheck.tmp;\
-	   grep -v $$i gnatlib/tocheck.tmp > gnatlib/tocheck;\
-	done;\
-	for o in `cat gnatlib/tocheck`; do\
-	   if [ ! -f gnatlib/$$o ]; then\
-	       s=`gnatls -a -s $$o | sed 's/\013//g'`;\
-	       (cd gnatlib;\
-	        $(GNAT_FOR_TARGET) $(COMPILE) $(GNATFLAGS) -I. -I.. -I- \
-	          $$s;\
-	        if test $$? = 0; then\
-	           echo $$o >>rebuild;\
-	        else\
-	           $(RM) -f tocheck;\
-	           break;\
-	        fi;\
-	       );\
-	   fi;\
-	done;\
-	$(CP) $(CP_PRESERVE) s-stratt.o s-stratt.ali gnatlib
-	echo s-stratt.o >>gnatlib/rebuild;\
-	echo yes > inlining
+	-rm -rf $(DESTDIR)$(GARLIC)
+	-$(mkinstalldirs) $(DESTDIR)$(GARLIC)
+	@echo $(DESTDIR)$(GARLIC) created
+	-rm -rf $(DESTDIR)$(includedir)/garlic
+	-$(mkinstalldirs) $(DESTDIR)$(includedir)/garlic
+	@echo $(DESTDIR)$(includedir)/garlic created
+	-$(mkinstalldirs) $(DESTDIR)$(libdir)/gnat
+	@echo $(DESTDIR)$(libdir)/gnat created
 
 linktest: $(srcdir)/linktest.adb $(OBJECTS)
 	$(GNAT_FOR_HOST) -c -a -m $(GNATFLAGS) -I$(srcdir) -I. \
@@ -541,47 +512,24 @@
 	$(GNAT_FOR_HOST) -b -a -m $(GNATFLAGS) -I$(srcdir) -I. \
 	  $(srcdir)/linktest.adb
 
-install-extra-libs: $(FILTERSEXTRALIBS) inlining install-dirs-local
+install-extra-libs: $(FILTERSEXTRALIBS) all-local install-dirs-local
 
 install-data-local: all-local install-dirs-local install-extra-libs 
-	if test ! -f inlining; then\
-	   exit 1;\
-	fi
-	@-for lib in libgnat.a libgnarl.a libAtasking.a libPtasking.a; do \
-	  pathtolib=`$(srcdir)/../Dist/config.sdefault $(GNAT_RTS_FLAG)`;\
-	  if test -f $$pathtolib$$lib; then \
-	    $(CP) $$pathtolib$$lib $(GARLIC)/$$lib;\
-	    chmod u+w $(GARLIC)/$$lib;\
-	    $(AR) d $(GARLIC)/$$lib s-rpc.o \
-	                            s-shasto.o \
-	                            s-parint.o 2>/dev/null;\
-	    if test `cat inlining` = "yes"; then\
-	      (cd gnatlib;\
-	       for o in `cat rebuild`; do \
-		 $(AR) d $(GARLIC)/$$lib $$o 2>/dev/null;\
-		 if test $$? = 0; then \
-		   $(AR) cq $(GARLIC)/$$lib $$o;\
-	           echo Replace inlined $$o in $$lib;\
-	         fi;\
-	       done);\
-	    fi;\
-	    $(RANLIB) $(GARLIC)/$$lib;\
+	@for i in $(SOURCES); do\
+		if test -f $$i; then\
+			$(CP) $(CP_PRESERVE) $$i $(DESTDIR)$(includedir)/garlic/;\
 	  fi;\
 	done
-	@if test `cat inlining` = "yes"; then\
-	  (cd gnatlib;\
-	   $(CP) $(CP_PRESERVE) `$(SED) 's/\.o/.ali/g' rebuild` $(GARLIC));\
-	fi
-	@for i in $(SOURCES)\
-		`echo $(OBJECTS) | $(SED) -e 's/\.o/.ali/g'`; do\
+	@for i in `echo $(OBJECTS) | $(SED) -e 's/\.o/.ali/g'`; do\
 		if test -f $$i; then\
-			$(CP) $(CP_PRESERVE) $$i $(GARLIC)/;\
+			$(CP) $(CP_PRESERVE) $$i $(DESTDIR)$(GARLIC)/;\
 		fi;\
 	done
-	$(AR) cq $(GARLIC)/libgarlic.a $(subst s-stratt.o,,$(OBJECTS))
-	$(RANLIB) $(GARLIC)/libgarlic.a
-	chmod a+r $(GARLIC)/*
-	chmod a-w $(GARLIC)/*
+	$(CP) $(CP_PRESERVE) garlic.gpr $(DESTDIR)$(libdir)/gnat/
+	$(AR) cq $(DESTDIR)$(GARLIC)/libgarlic.a $(OBJECTS)
+	$(RANLIB) $(DESTDIR)$(GARLIC)/libgarlic.a
+	chmod a+r $(DESTDIR)$(GARLIC)/*
+	chmod a-w $(DESTDIR)$(GARLIC)/*
 
 # Dependencies
 
@@ -597,10 +545,9 @@
 ### dependencies or to use the "fast" target.
 ###
 ### DO NOT REMOVE THIS LINE, IT IS USED BY MAKEDEPEND ###
-s-dsaser.o: s-dsaser.ads s-garlic.ads s-gardeb.ads s-garexc.ads s-gasoli.ads s-gastha.ads s-garstr.ads s-gartyp.ads s-garuni.ads s-parint.ads s-rpc.ads
 s-gafizi.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-gafizi.ads s-gafizi.adb s-garhea.ads s-garpro.ads s-gasoli.ads s-gastha.ads s-garstr.ads s-gartyp.ads
 s-galiop.o: s-garlic.ads s-galiop.ads
-s-ganata.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-ganata.ads s-ganata.adb s-gasoli.ads s-gasoli.adb s-gartab.ads s-gartab.adb s-gartyp.ads s-garuti.ads s-stratt.adb
+s-ganata.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-ganata.ads s-ganata.adb s-gasoli.ads s-gasoli.adb s-gartab.ads s-gartab.adb s-gartyp.ads s-garuti.ads
 s-ganeut.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-ganeut.ads s-ganeut.adb s-gasoli.ads s-gartyp.ads
 s-ganota.o: s-garlic.ads s-garexc.ads s-ganota.ads s-ganota.adb s-garpro.ads s-gasoli.ads s-gartyp.ads
 s-gaphlo.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-gaphlo.ads s-gaphlo.adb s-garpro.ads s-gasoli.ads s-gartyp.ads s-garuti.ads
@@ -612,38 +559,37 @@
 s-gardeb.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-gasoli.ads s-gartyp.ads
 s-garela.o: s-garlic.ads s-garela.ads s-garela.adb s-garopt.ads s-gasoli.ads s-gartas.ads s-gartyp.ads
 s-garexc.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garexc.adb s-gasoli.ads s-gartyp.ads
-s-garfil.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-garfil.adb s-garhea.ads s-ganata.ads s-ganata.adb s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garstr.ads s-garstr.adb s-gartab.ads s-gartab.adb s-gartyp.ads s-garuti.ads s-stratt.adb
-s-gargro.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-gargro.ads s-gargro.adb s-garhea.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garstr.ads s-garstr.adb s-gartyp.ads s-stratt.adb
+s-garfil.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-garfil.adb s-garhea.ads s-ganata.ads s-ganata.adb s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garstr.ads s-garstr.adb s-gartab.ads s-gartab.adb s-gartyp.ads s-garuti.ads
+s-gargro.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-gargro.ads s-gargro.adb s-garhea.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garstr.ads s-garstr.adb s-gartyp.ads
 s-garhea.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-gargro.ads s-garhea.ads s-garhea.adb s-galiop.ads s-garopt.ads s-garpar.ads s-garpar.adb s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-gartab.ads s-gartra.ads s-gartyp.ads s-garuti.ads
 s-garlic.o: s-garlic.ads
 s-garopt.o: s-garlic.ads s-garopt.ads s-garopt.adb s-gaplsp.ads s-gartyp.ads s-garuti.ads
-s-garpar.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-gargro.ads s-garhea.ads s-ganata.ads s-garopt.ads s-garpar.ads s-garpar.adb s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garstr.ads s-gartab.ads s-gartab.adb s-gartyp.ads s-garuti.ads s-stratt.adb
+s-garpar.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-gargro.ads s-garhea.ads s-ganata.ads s-garopt.ads s-garpar.ads s-garpar.adb s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garstr.ads s-gartab.ads s-gartab.adb s-gartyp.ads s-garuti.ads
 s-garpri.o: s-garlic.ads s-garpri.ads s-garpri.adb
 s-garpro.o: s-garlic.ads s-garexc.ads s-garpro.ads s-garpro.adb s-gartyp.ads
 s-garrem.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-garrem.ads s-garrem.adb s-gasoli.ads s-gastha.ads s-garstr.ads s-gartyp.ads s-garuti.ads
 s-garsta.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garela.ads s-garexc.ads s-garexc.adb s-garfil.ads s-gargro.ads s-garhea.ads s-ganata.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gaprco.ads s-garrem.ads s-gasoli.ads s-garsta.ads s-garsta.adb s-gastha.ads s-garsto.ads s-gastco.ads s-garstr.ads s-garter.ads s-gartra.ads s-gartyp.ads s-garuni.ads s-garuti.ads
 s-garsto.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garpar.ads s-gaphlo.ads s-gaplsp.ads s-garpro.ads s-gasoli.ads s-gastha.ads s-garsto.ads s-garsto.adb s-garstr.ads s-gartyp.ads s-garuni.ads
-s-garstr.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-gasoli.ads s-gasoli.adb s-gastha.ads s-gastha.adb s-garstr.ads s-garstr.adb s-gartyp.ads s-stratt.adb
+s-garstr.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-gasoli.ads s-gasoli.adb s-gastha.ads s-gastha.adb s-garstr.ads s-garstr.adb s-gartyp.ads
 s-gartab.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-ganata.ads s-gasoli.ads s-gartab.ads s-gartab.adb s-gartyp.ads
-s-gartas.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-gasoli.ads s-gartas.ads s-gartas.adb s-gartyp.ads s-stratt.adb
-s-garter.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garela.ads s-garexc.ads s-garfil.ads s-garhea.ads s-garhea.adb s-galiop.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-garter.ads s-garter.adb s-gartra.ads s-gartyp.ads s-garuti.ads s-stratt.adb
-s-gartra.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garopt.ads s-gasoli.ads s-gastha.ads s-garstr.ads s-gartra.ads s-gartra.adb s-gartyp.ads s-stratt.adb
+s-gartas.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-gasoli.ads s-gartas.ads s-gartas.adb s-gartyp.ads
+s-garter.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garela.ads s-garexc.ads s-garfil.ads s-garhea.ads s-garhea.adb s-galiop.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-garter.ads s-garter.adb s-gartra.ads s-gartyp.ads s-garuti.ads
+s-gartra.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garopt.ads s-gasoli.ads s-gastha.ads s-garstr.ads s-gartra.ads s-gartra.adb s-gartyp.ads
 s-gartyp.o: s-garlic.ads s-gartyp.ads s-gartyp.adb
-s-garuni.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-gargro.ads s-garhea.ads s-garhea.adb s-galiop.ads s-ganata.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-gartab.ads s-gartab.adb s-gartra.ads s-gartyp.ads s-garuni.ads s-garuni.adb s-garuti.ads s-stratt.adb
+s-garuni.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-gargro.ads s-garhea.ads s-garhea.adb s-galiop.ads s-ganata.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-gartab.ads s-gartab.adb s-gartra.ads s-gartyp.ads s-garuni.ads s-garuni.adb s-garuti.ads
 s-garuti.o: s-garlic.ads s-garuti.ads s-garuti.adb
-s-gasoli.o: s-garlic.ads s-gasoli.ads s-gasoli.adb s-gartyp.ads s-stratt.adb
+s-gasoli.o: s-garlic.ads s-gasoli.ads s-gasoli.adb s-gartyp.ads
 s-gastco.o: s-garlic.ads s-garexc.ads s-garsto.ads s-gastco.ads s-gastco.adb s-gartyp.ads
 s-gastdf.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garopt.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-garsto.ads s-gastdf.ads s-gastdf.adb s-gartyp.ads
-s-gastds.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garexc.adb s-garhea.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-gastds.ads s-gastds.adb s-garstr.ads s-gartyp.ads s-garuni.ads s-stratt.adb
+s-gastds.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garexc.adb s-garhea.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-gastha.ads s-garsto.ads s-gastds.ads s-gastds.adb s-garstr.ads s-gartyp.ads s-garuni.ads
 s-gastha.o: s-garlic.ads s-gasoli.ads s-gastha.ads s-gastha.adb s-gartyp.ads
 s-gprese.o: s-garlic.ads s-garexc.ads s-garpro.ads s-gaprre.ads s-gprese.ads s-gartyp.ads
 s-gptcse.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garpro.ads s-gaprtc.ads s-gptcse.ads s-gptcse.adb s-gasoli.ads s-gartyp.ads
-s-parint.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garhea.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-garsta.ads s-gastha.ads s-garsto.ads s-garstr.ads s-gartyp.ads s-garuni.ads s-garuti.ads s-garuti.adb s-parint.ads s-parint.adb s-rpc.ads s-stratt.adb
-s-rpc.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-garhea.ads s-garhea.adb s-galiop.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpri.ads s-gaprma.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-garsta.ads s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-gartra.ads s-gartyp.ads s-garuni.ads s-garuti.ads s-rpc.ads s-rpc.adb s-stratt.adb
-s-rpcser.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garhea.ads s-garopt.ads s-gaplsp.ads s-garpri.ads s-gaprma.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-garsta.ads s-gastha.ads s-garstr.ads s-garstr.adb s-gartas.ads s-gartyp.ads s-garuni.ads s-parint.ads s-rpc.ads s-rpcser.ads s-rpcser.adb s-stratt.adb
+s-parint.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garhea.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpro.ads s-gasoli.ads s-garsta.ads s-gastha.ads s-garsto.ads s-garstr.ads s-gartyp.ads s-garuni.ads s-garuti.ads s-garuti.adb s-parint.ads s-parint.adb s-rpc.ads
+s-rpc.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garfil.ads s-garhea.ads s-garhea.adb s-galiop.ads s-garopt.ads s-garpar.ads s-gaphlo.ads s-garpri.ads s-gaprma.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-garsta.ads s-gastha.ads s-garsto.ads s-garstr.ads s-garstr.adb s-gartra.ads s-gartyp.ads s-garuni.ads s-garuti.ads s-rpc.ads s-rpc.adb
+s-rpcser.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garhea.ads s-garopt.ads s-gaplsp.ads s-garpri.ads s-gaprma.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-garsta.ads s-gastha.ads s-garstr.ads s-garstr.adb s-gartas.ads s-gartyp.ads s-garuni.ads s-parint.ads s-rpc.ads s-rpcser.ads s-rpcser.adb
 s-rpstio.o: s-garlic.ads s-gardeb.ads s-gardeb.adb s-garexc.ads s-garhea.ads s-ganata.ads s-garpro.ads s-gasoli.ads s-gasoli.adb s-garsta.ads s-gastha.ads s-garstr.ads s-garstr.adb s-gartab.ads s-gartab.adb s-gartyp.ads s-rpc.ads s-rpstio.ads s-rpstio.adb
-s-shasto.o: s-garlic.ads s-gardeb.ads s-garexc.ads s-garexc.adb s-garsto.ads s-gartyp.ads s-shasto.ads s-shasto.adb
-s-stratt.o: s-stratt.adb
+s-shasto.o: s-garlic.ads s-gardeb.ads s-garexc.ads s-garexc.adb s-garsto.ads s-gartyp.ads s-shasto.adb
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: