consolodate Makefiles
The tree contained many operating system specific Makefiles which were being included in other Makefiles. This commit removes those and adds the code to the makefiles which included them using make's conditional processing. X-Gentoo-Bug: 387441 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=387441
This commit is contained in:
		
							
								
								
									
										16
									
								
								etc/Makefile
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								etc/Makefile
									
									
									
									
									
								
							| @@ -5,7 +5,21 @@ CLEANFILES+=	rc.conf | ||||
|  | ||||
| MK=	../mk | ||||
| include ${MK}/os.mk | ||||
| include Makefile.${OS} | ||||
|  | ||||
| ifeq ($(OS),FreeBSD) | ||||
| SED_EXTRA=	-e 's:@TERM@:cons25:g' | ||||
| SRCS+=		rc.conf.in rc.in rc.shutdown.in | ||||
| CONF+=		devd.conf | ||||
| BIN+=		rc rc.shutdown rc.devd | ||||
| else ifeq ($(OS),Linux) | ||||
| SED_EXTRA=	-e 's:@TERM@:wsvt25:g' | ||||
| SRCS+=		rc.conf.in rc.in rc.shutdown.in | ||||
| else ifeq ($(OS),NetBSD) | ||||
| SED_EXTRA=	-e 's:@TERM@:wsvt25:g' | ||||
| SRCS+=		rc.conf.in rc.in rc.shutdown.in | ||||
| BIN+=		rc rc.shutdown | ||||
| endif | ||||
|  | ||||
| include ${MK}/scripts.mk | ||||
|  | ||||
| # We can't use "ifndef" here because that treats set-but-empty | ||||
|   | ||||
| @@ -1,4 +0,0 @@ | ||||
| SED_EXTRA=	-e 's:@TERM@:cons25:g' | ||||
| SRCS+=		rc.conf.in rc.in rc.shutdown.in | ||||
| CONF+=		devd.conf | ||||
| BIN+=		rc rc.shutdown rc.devd | ||||
| @@ -1,2 +0,0 @@ | ||||
| SED_EXTRA=	-e 's:@TERM@:wsvt25:g' | ||||
| SRCS+=		rc.conf.in rc.in rc.shutdown.in | ||||
| @@ -1,3 +0,0 @@ | ||||
| SED_EXTRA=	-e 's:@TERM@:wsvt25:g' | ||||
| SRCS+=		rc.conf.in rc.in rc.shutdown.in | ||||
| BIN+=		rc rc.shutdown | ||||
		Reference in New Issue
	
	Block a user