diff options
Diffstat (limited to 'usr/src/lib/libeti')
-rw-r--r-- | usr/src/lib/libeti/Makefile | 8 | ||||
-rw-r--r-- | usr/src/lib/libeti/form/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/form/Makefile.com | 12 | ||||
-rw-r--r-- | usr/src/lib/libeti/form/amd64/Makefile | 2 | ||||
-rw-r--r-- | usr/src/lib/libeti/form/i386/Makefile | 3 | ||||
-rw-r--r-- | usr/src/lib/libeti/form/sparc/Makefile | 3 | ||||
-rw-r--r-- | usr/src/lib/libeti/form/sparcv9/Makefile | 2 | ||||
-rw-r--r-- | usr/src/lib/libeti/menu/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/menu/Makefile.com | 12 | ||||
-rw-r--r-- | usr/src/lib/libeti/menu/amd64/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/libeti/menu/i386/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/menu/sparc/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/menu/sparcv9/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/libeti/panel/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/panel/Makefile.com | 12 | ||||
-rw-r--r-- | usr/src/lib/libeti/panel/amd64/Makefile | 4 | ||||
-rw-r--r-- | usr/src/lib/libeti/panel/i386/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/panel/sparc/Makefile | 5 | ||||
-rw-r--r-- | usr/src/lib/libeti/panel/sparcv9/Makefile | 4 |
19 files changed, 51 insertions, 54 deletions
diff --git a/usr/src/lib/libeti/Makefile b/usr/src/lib/libeti/Makefile index 5a8950eb81..4de58bf6bd 100644 --- a/usr/src/lib/libeti/Makefile +++ b/usr/src/lib/libeti/Makefile @@ -20,12 +20,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989 by Sun Microsystems, Inc. # -# lib/libeti/Makefile -# + # include global definitions include ../../Makefile.master @@ -38,7 +35,6 @@ clobber:= TARGET= clobber install:= TARGET= install install_h:= TARGET= install_h check:= TARGET= check -lint:= TARGET= lint # definitions for install_h target HDRS= eti.h @@ -52,7 +48,7 @@ $(ROOTHDRDIR)/%: % .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) $(HDRSUBDIRS) diff --git a/usr/src/lib/libeti/form/Makefile b/usr/src/lib/libeti/form/Makefile index a130b89a17..65b525da03 100644 --- a/usr/src/lib/libeti/form/Makefile +++ b/usr/src/lib/libeti/form/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= form.h utility.h diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com index c526d231b3..5a9eae2ad9 100644 --- a/usr/src/lib/libeti/form/Makefile.com +++ b/usr/src/lib/libeti/form/Makefile.com @@ -65,12 +65,10 @@ OBJECTS= \ # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) - CPPFLAGS += -I../inc CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -lc @@ -79,11 +77,17 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-char-subscripts +COMPATLINKS= usr/ccs/lib/libform.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libform.so + +$(ROOT)/usr/ccs/lib/libform.so := COMPATLINKTARGET= ../../lib/libform.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/libform.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/libeti/form/amd64/Makefile b/usr/src/lib/libeti/form/amd64/Makefile index 4201c0bb20..5757f3b5ec 100644 --- a/usr/src/lib/libeti/form/amd64/Makefile +++ b/usr/src/lib/libeti/form/amd64/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/form/i386/Makefile b/usr/src/lib/libeti/form/i386/Makefile index af931b5d9a..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/i386/Makefile +++ b/usr/src/lib/libeti/form/i386/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparc/Makefile b/usr/src/lib/libeti/form/sparc/Makefile index af931b5d9a..ee434ebd50 100644 --- a/usr/src/lib/libeti/form/sparc/Makefile +++ b/usr/src/lib/libeti/form/sparc/Makefile @@ -26,4 +26,5 @@ include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/form/sparcv9/Makefile b/usr/src/lib/libeti/form/sparcv9/Makefile index 06a8dcb9bb..34a4272b2b 100644 --- a/usr/src/lib/libeti/form/sparcv9/Makefile +++ b/usr/src/lib/libeti/form/sparcv9/Makefile @@ -29,4 +29,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/Makefile b/usr/src/lib/libeti/menu/Makefile index 903974a531..834c77014c 100644 --- a/usr/src/lib/libeti/menu/Makefile +++ b/usr/src/lib/libeti/menu/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= menu.h diff --git a/usr/src/lib/libeti/menu/Makefile.com b/usr/src/lib/libeti/menu/Makefile.com index 2782c3bc6c..4964d9cb93 100644 --- a/usr/src/lib/libeti/menu/Makefile.com +++ b/usr/src/lib/libeti/menu/Makefile.com @@ -63,23 +63,27 @@ OBJECTS= \ # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) - CPPFLAGS += -I../inc CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libmenu.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libmenu.so + +$(ROOT)/usr/ccs/lib/libmenu.so := COMPATLINKTARGET= ../../lib/libmenu.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libmenu.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/libeti/menu/amd64/Makefile b/usr/src/lib/libeti/menu/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/amd64/Makefile +++ b/usr/src/lib/libeti/menu/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/menu/i386/Makefile b/usr/src/lib/libeti/menu/i386/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/i386/Makefile +++ b/usr/src/lib/libeti/menu/i386/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparc/Makefile b/usr/src/lib/libeti/menu/sparc/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/menu/sparc/Makefile +++ b/usr/src/lib/libeti/menu/sparc/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/menu/sparcv9/Makefile b/usr/src/lib/libeti/menu/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/menu/sparcv9/Makefile +++ b/usr/src/lib/libeti/menu/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/panel/Makefile b/usr/src/lib/libeti/panel/Makefile index d39c71495b..70d8a0ac35 100644 --- a/usr/src/lib/libeti/panel/Makefile +++ b/usr/src/lib/libeti/panel/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -34,11 +32,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) # definitions for install_h target HDRS= panel.h diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com index 2783c77ee4..02ccd30ee2 100644 --- a/usr/src/lib/libeti/panel/Makefile.com +++ b/usr/src/lib/libeti/panel/Makefile.com @@ -39,23 +39,27 @@ OBJECTS= \ # include library definitions include ../../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR= ../common -$(LINTLIB) := SRCS=$(SRCDIR)/$(LINTSRC) - CPPFLAGS += -I../inc CFLAGS += $(CCVERBOSE) LDLIBS += -lcurses -lc CERRWARN += -_gcc=-Wno-parentheses +COMPATLINKS= usr/ccs/lib/libpanel.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libpanel.so + +$(ROOT)/usr/ccs/lib/libpanel.so:= COMPATLINKTARGET=../../lib/libpanel.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libpanel.so.1 + .KEEP_STATE: all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/libeti/panel/amd64/Makefile b/usr/src/lib/libeti/panel/amd64/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/panel/amd64/Makefile +++ b/usr/src/lib/libeti/panel/amd64/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) diff --git a/usr/src/lib/libeti/panel/i386/Makefile b/usr/src/lib/libeti/panel/i386/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/i386/Makefile +++ b/usr/src/lib/libeti/panel/i386/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/panel/sparc/Makefile b/usr/src/lib/libeti/panel/sparc/Makefile index 775621cd27..fa3f9786e2 100644 --- a/usr/src/lib/libeti/panel/sparc/Makefile +++ b/usr/src/lib/libeti/panel/sparc/Makefile @@ -22,11 +22,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: -install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) \ + $(ROOTCOMPATLINKS) diff --git a/usr/src/lib/libeti/panel/sparcv9/Makefile b/usr/src/lib/libeti/panel/sparcv9/Makefile index 04160e850a..a2b9ee510c 100644 --- a/usr/src/lib/libeti/panel/sparcv9/Makefile +++ b/usr/src/lib/libeti/panel/sparcv9/Makefile @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # include ../Makefile.com @@ -32,4 +32,4 @@ DYNFLAGS += $(DYNFLAGS64) .KEEP_STATE: -install: all $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) |