Attachment #244049 for bug #333971

View | Details | Raw Unified | Return to bug 333971
Collapse All | Expand All





ifdef DEBUG
CFLAGS    ?= -g -Wall -DDEBUG
AUTOFS_LDFLAGS   = -g
STRIP     = :
else
ifdef DONTSTRIP
CFLAGS    ?= -O2 -g
AUTOFS_LDFLAGS   = -g
STRIP     = :
else
CFLAGS    ?= -O2 -Wall
AUTOFS_LDFLAGS   = -s
STRIP     = strip --strip-debug
endif
endif

SOLDFLAGS = -shared

CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
LDFLAGS += -lpthread

ifdef TIRPCLIB
CFLAGS += -I/usr/include/tirpc
AUTOFS_LDFLAGS += $(TIRPCLIB)
endif

ifdef DMALLOCLIB
AUTOFS_LDFLAGS += $(DMALLOCLIB)
endif

# Standard rules

	$(CC) $(CFLAGS) -S $<

.c.so:
	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
	$(STRIP) $*.so




CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
CFLAGS += -DVERSION_STRING=\"$(version)\"
LDFLAGS += -rdynamic
LIBS = -ldl -lpthread

all: automount

automount: $(OBJS) $(AUTOFS_LIB)
	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
	$(STRIP) automount

clean:




# Ad hoc compilation rules for modules which need auxilliary libraries
#
lookup_hesiod.so: lookup_hesiod.c
	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
	$(STRIP) lookup_hesiod.so


	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<

lookup_ldap.so: lookup_ldap.c dclist.o $(SASL_OBJ)
	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
		lookup_ldap.c dclist.o $(SASL_OBJ) \
		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
	$(STRIP) lookup_ldap.so

mount_nfs.so: mount_nfs.c replicated.o
	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
	$(STRIP) mount_nfs.so


Return to bug 333971

Lines 20-31 Link Here

(-)autofs-5.0.4-old/daemon/Makefile (-2 / +2 lines)
20	CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"	20	CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
21	CFLAGS += -DVERSION_STRING=\"$(version)\"	21	CFLAGS += -DVERSION_STRING=\"$(version)\"
22	LDFLAGS += -rdynamic	22	LDFLAGS += -rdynamic
23	LIBS = -ldl	23	LIBS = -ldl -lpthread
24		24
25	all: automount	25	all: automount
26		26
27	automount: $(OBJS) $(AUTOFS_LIB)	27	automount: $(OBJS) $(AUTOFS_LIB)
28	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)	28	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
29	$(STRIP) automount	29	$(STRIP) automount
30		30
31	clean:	31	clean:

Lines 24-39 Link Here

(-)autofs-5.0.4-old/Makefile.rules (-7 / +6 lines)
24		24
25	ifdef DEBUG	25	ifdef DEBUG
26	CFLAGS ?= -g -Wall -DDEBUG	26	CFLAGS ?= -g -Wall -DDEBUG
27	LDFLAGS = -g	27	AUTOFS_LDFLAGS = -g
28	STRIP = :	28	STRIP = :
29	else	29	else
30	ifdef DONTSTRIP	30	ifdef DONTSTRIP
31	CFLAGS ?= -O2 -g	31	CFLAGS ?= -O2 -g
32	LDFLAGS = -g	32	AUTOFS_LDFLAGS = -g
33	STRIP = :	33	STRIP = :
34	else	34	else
35	CFLAGS ?= -O2 -Wall	35	CFLAGS ?= -O2 -Wall
36	LDFLAGS = -s	36	AUTOFS_LDFLAGS = -s
37	STRIP = strip --strip-debug	37	STRIP = strip --strip-debug
38	endif	38	endif
39	endif	39	endif
Lines 45-59 Link Here
45	SOLDFLAGS = -shared	45	SOLDFLAGS = -shared
46		46
47	CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64	47	CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
48	LDFLAGS += -lpthread
49		48
50	ifdef TIRPCLIB	49	ifdef TIRPCLIB
51	CFLAGS += -I/usr/include/tirpc	50	CFLAGS += -I/usr/include/tirpc
52	LDFLAGS += $(TIRPCLIB)	51	AUTOFS_LDFLAGS += $(TIRPCLIB)
53	endif	52	endif
54		53
55	ifdef DMALLOCLIB	54	ifdef DMALLOCLIB
56	LDFLAGS += $(DMALLOCLIB)	55	AUTOFS_LDFLAGS += $(DMALLOCLIB)
57	endif	56	endif
58		57
59	# Standard rules	58	# Standard rules
Lines 67-71 Link Here
67	$(CC) $(CFLAGS) -S $<	66	$(CC) $(CFLAGS) -S $<
68		67
69	.c.so:	68	.c.so:
70	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)	69	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
71	$(STRIP) $*.so	70	$(STRIP) $*.so

Lines 79-85 Link Here

(-)autofs-5.0.4-old/modules/Makefile (-3 / +3 lines)
79	# Ad hoc compilation rules for modules which need auxilliary libraries	79	# Ad hoc compilation rules for modules which need auxilliary libraries
80	#	80	#
81	lookup_hesiod.so: lookup_hesiod.c	81	lookup_hesiod.so: lookup_hesiod.c
82	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \	82	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
83	lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)	83	lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
84	$(STRIP) lookup_hesiod.so	84	$(STRIP) lookup_hesiod.so
85		85
Lines 87-99 Link Here
87	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<	87	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
88		88
89	lookup_ldap.so: lookup_ldap.c dclist.o $(SASL_OBJ)	89	lookup_ldap.so: lookup_ldap.c dclist.o $(SASL_OBJ)
90	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \	90	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
91	lookup_ldap.c dclist.o $(SASL_OBJ) \	91	lookup_ldap.c dclist.o $(SASL_OBJ) \
92	$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)	92	$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
93	$(STRIP) lookup_ldap.so	93	$(STRIP) lookup_ldap.so
94		94
95	mount_nfs.so: mount_nfs.c replicated.o	95	mount_nfs.so: mount_nfs.c replicated.o
96	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \	96	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
97	mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)	97	mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
98	$(STRIP) mount_nfs.so	98	$(STRIP) mount_nfs.so
99		99