mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-04 00:02:52 -05:00 
			
		
		
		
	When maintaining or merging patches, one of the most common sources for conflicts are the list of objects in makefiles. Especially when the split across lines has been changed on both sides, which is somewhat common due to attempting to stay below 80 columns, those conflicts are unnecessarily laborious to resolve. By splitting, and alphabetically sorting, OBJS style lines into one object per line, conflicts should be less frequent, and easier to resolve when they still occur. Author: Andres Freund Discussion: https://postgr.es/m/20191029200901.vww4idgcxv74cwes@alap3.anarazel.de
		
			
				
	
	
		
			34 lines
		
	
	
		
			726 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			34 lines
		
	
	
		
			726 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
# contrib/sepgsql/Makefile
 | 
						|
 | 
						|
MODULE_big = sepgsql
 | 
						|
OBJS = \
 | 
						|
	$(WIN32RES) \
 | 
						|
	database.o \
 | 
						|
	dml.o \
 | 
						|
	hooks.o \
 | 
						|
	label.o \
 | 
						|
	proc.o \
 | 
						|
	relation.o \
 | 
						|
	schema.o \
 | 
						|
	selinux.o \
 | 
						|
	uavc.o
 | 
						|
DATA_built = sepgsql.sql
 | 
						|
PGFILEDESC = "sepgsql - SELinux integration"
 | 
						|
 | 
						|
# Note: because we don't tell the Makefile there are any regression tests,
 | 
						|
# we have to clean those result files explicitly
 | 
						|
EXTRA_CLEAN = -r $(pg_regress_clean_files) tmp/ *.pp sepgsql-regtest.if sepgsql-regtest.fc
 | 
						|
 | 
						|
ifdef USE_PGXS
 | 
						|
PG_CONFIG = pg_config
 | 
						|
PGXS := $(shell $(PG_CONFIG) --pgxs)
 | 
						|
include $(PGXS)
 | 
						|
else
 | 
						|
subdir = contrib/sepgsql
 | 
						|
top_builddir = ../..
 | 
						|
include $(top_builddir)/src/Makefile.global
 | 
						|
include $(top_srcdir)/contrib/contrib-global.mk
 | 
						|
endif
 | 
						|
 | 
						|
SHLIB_LINK += -lselinux
 |