7186113 vpanels bits shouldn't use ctf*
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 25 Jul 2012 10:48:11 -0700
changeset 929 20bde096663e
parent 928 3d14753950e0
child 930 b051ff1aad38
7186113 vpanels bits shouldn't use ctf*
components/visual-panels/make-rules/Makefile.com
components/visual-panels/make-rules/Makefile.env
components/visual-panels/make-rules/Makefile.targ
--- a/components/visual-panels/make-rules/Makefile.com	Wed Jul 25 00:05:25 2012 -0700
+++ b/components/visual-panels/make-rules/Makefile.com	Wed Jul 25 10:48:11 2012 -0700
@@ -44,7 +44,6 @@
 CLEAN_FILES += $(MOD_ALLOBJS) $(MOD_API_HDRS) $(MOD_API_CFILES) $(CLEANFILES) \
 	$(LNFILES)
 CLOBBER_FILES += $(MOD_LIBNAME)
-CTFCONVERT_HOOK = && $(CTFCONVERT) -l foo [email protected]
 
 LDFLAGS = $(MAPOPTS) -Wl,-zdefs -lc
 
@@ -63,7 +62,6 @@
 
 $(MOD_LIBNAME):	$(MOD_ALLOBJS) $(MAPFILES)
 	$(CC) -G -o [email protected] $(MOD_ALLOBJS) $(LDFLAGS) $(LDLIBS)
-	$(CTFMERGE) -l foo -o $(MOD_LIBNAME) $(MOD_ALLOBJS)
 
 install: $(MOD_INSTALLDIR)/$(MOD_LIBNAME)
 
@@ -76,7 +74,7 @@
 	$(INS.file)
 
 %.o: ../%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $< $(CTFCONVERT_HOOK)
+	$(COMPILE.c) $(OUTPUT_OPTION) $<
 
 %.ln: ../%.c
 	$(LINT.c) $(OUTPUT_OPTION) -c $<
--- a/components/visual-panels/make-rules/Makefile.env	Wed Jul 25 00:05:25 2012 -0700
+++ b/components/visual-panels/make-rules/Makefile.env	Wed Jul 25 10:48:11 2012 -0700
@@ -120,8 +120,6 @@
 PYTHON = /usr/bin/python
 TOUCH = /usr/bin/touch
 TRUE = /usr/bin/true
-CTFMERGE = /opt/onbld/bin/$(ISA)/ctfmerge
-CTFCONVERT = /opt/onbld/bin/$(ISA)/ctfconvert
 INTLTOOL_EXTRACT = /usr/bin/intltool-extract
 INTLTOOL_UPDATE = /usr/bin/intltool-update
 INTLTOOL_MERGE = /usr/bin/intltool-merge
--- a/components/visual-panels/make-rules/Makefile.targ	Wed Jul 25 00:05:25 2012 -0700
+++ b/components/visual-panels/make-rules/Makefile.targ	Wed Jul 25 10:48:11 2012 -0700
@@ -103,6 +103,6 @@
 	$(RADADRGEN) -c . -rm $(ADROPTS) $<
 
 .c.o:
-	$(COMPILE.c) $(OUTPUT_OPTION) $< $(CTFCONVERT_HOOK)
+	$(COMPILE.c) $(OUTPUT_OPTION) $<
 
 FRC: