Hi,

I'm playing with the X build infrastructure and I noticed that 
SharedLibObjCompile is redundant. Attached is a patch to remove it.

Nick
ps. see http://mail-index.netbsd.org/tech-x11/2003/06/02/0001.html for what 
I'm trying to achieve.


Index: config/cf/Imake.rules
===================================================================
RCS file: /cvs/xc/config/cf/Imake.rules,v
retrieving revision 3.119
diff -c -r3.119 Imake.rules
*** config/cf/Imake.rules	2003/05/29 15:31:23	3.119
--- config/cf/Imake.rules	2003/06/09 19:49:22
***************
*** 123,129 ****
   * LibObjCompile		(dir,options)
   * DebuggedLibObjCompile	(options)
   * ProfiledLibObjCompile	(options)
-  * SharedLibObjCompile		(options)
   * NormalLibraryObjectRule	()
   * NormalFortranObjectRule	()
   * ObjectFromSpecialSource	(dst,src,flags)
--- 123,128 ----
***************
*** 2277,2289 ****
  
  #ifndef UnsharedLibObjCplusplusCompile
  #define UnsharedLibObjCplusplusCompile(options) LibObjCplusplusCompile(unshared,$(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) options)
- #endif
- 
- /*
-  * SharedLibObjCompile - compile fragment for shared objects
-  */
- #ifndef SharedLibObjCompile
- #define SharedLibObjCompile(options) LibObjCompile(shared,options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS))
  #endif
  
  /*
--- 2276,2281 ----
Index: config/cf/necLib.rules
===================================================================
RCS file: /cvs/xc/config/cf/necLib.rules,v
retrieving revision 1.3
diff -c -r1.3 necLib.rules
*** config/cf/necLib.rules	2001/01/17 16:22:32	1.3
--- config/cf/necLib.rules	2003/06/09 19:49:22
***************
*** 33,40 ****
  #define SeparateSharedCompile NO
  #endif
  
- #define SharedLibObjCompile(options) $(_NULLCMD_)
- 
  /*
   * InstallSharedLibrary - generate rules to install the shared library.
   */
--- 33,38 ----
Index: config/cf/sv3Lib.rules
===================================================================
RCS file: /cvs/xc/config/cf/sv3Lib.rules,v
retrieving revision 3.6
diff -c -r3.6 sv3Lib.rules
*** config/cf/sv3Lib.rules	2003/04/14 20:35:50	3.6
--- config/cf/sv3Lib.rules	2003/06/09 19:49:22
***************
*** 103,121 ****
  #endif
  
  /*
-  * SharedLibObjCompile - compile fragment for shared objects
-  */
- #ifndef SharedLibObjCompile
- #define SharedLibObjCompile(options) $(RM) shared/$@ 	                   @@\
- 	cat import.h $*.c >_$*.c                                           @@\
-         $(CC) -c $(ANSICCOPTIONS) $(CCOPTIONS) $(ALLDEFINES) options \     @@\
- $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) \@@\
- _$*.c                                                                      @@\
- 	$(MV) _$*.o shared/$@                                              @@\
- 	$(RM) _$*.c
- #endif
- 
- /*
   * NormalSharedLibObjCompile - compile fragment for shared object when
   * a normal library is not being built
   */
--- 103,108 ----

Reply via email to