1 *** bison-2.3/lib/Makefile.in.orig Thu Nov 16 13:34:32 2006 |
1 --- bison-3.0.4/Makefile.in.orig Tue Oct 27 10:12:31 2015 |
2 --- bison-2.3/lib/Makefile.in Thu Nov 16 13:37:18 2006 |
2 +++ bison-3.0.4/Makefile.in Tue Oct 27 10:13:12 2015 |
3 *************** |
3 @@ -473,6 +473,12 @@ |
4 *** 108,113 **** |
4 @ENABLE_YACC_TRUE@am_lib_liby_a_OBJECTS = lib/main.$(OBJEXT) \ |
5 --- 108,116 ---- |
5 @ENABLE_YACC_TRUE@ lib/yyerror.$(OBJEXT) |
6 liby_a_LIBADD = |
6 lib_liby_a_OBJECTS = $(am_lib_liby_a_OBJECTS) |
7 am_liby_a_OBJECTS = main.$(OBJEXT) yyerror.$(OBJEXT) |
7 + |
8 liby_a_OBJECTS = $(am_liby_a_OBJECTS) |
8 +# doing this for just the OBJECTS macros doesn't seeem to work |
9 + |
9 +# and we rely on the approprate xregs/no-app-regs flag already |
10 + main.o yyerror.o : CFLAGS += -DPIC -KPIC -Qoption cg -xregs=no%appl |
10 +# being in our CFLAGS from shared-macros.mk |
11 + |
11 +lib/yyerror.o lib/main.o: CFLAGS += $(CC_PIC) |
12 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) |
12 + |
13 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp |
13 @FLEX_CXX_WORKS_TRUE@am__EXEEXT_1 = examples/calc++/calc++$(EXEEXT) |
14 am__depfiles_maybe = depfiles |
14 PROGRAMS = $(bin_PROGRAMS) |
15 *************** |
15 am__objects_2 = examples/calc++/examples_calc___calc__-calc++-driver.$(OBJEXT) \ |
16 *** 248,254 **** |
16 @@ -2501,6 +2507,9 @@ |
17 BUILT_SOURCES = $(GETOPT_H) $(STDBOOL_H) $(UNISTD_H) |
17 @ENABLE_YACC_TRUE@EXTRA_LIBRARIES = lib/liby.a |
18 EXTRA_DIST = getopt_.h getopt_int.h stdbool_.h |
18 @ENABLE_YACC_TRUE@lib_liby_a_SOURCES = lib/main.c lib/yyerror.c |
19 MOSTLYCLEANFILES = getopt.h getopt.h-t stdbool.h stdbool.h-t unistd.h |
19 LDADD = lib/libbison.a $(LIBINTL) |
20 ! lib_LIBRARIES = $(YACC_LIBRARY) |
20 + |
21 EXTRA_LIBRARIES = liby.a |
21 +lib_LIBRARIES += lib/liby.so.1 |
22 noinst_LIBRARIES = libbison.a |
22 + |
23 liby_a_SOURCES = main.c yyerror.c |
23 # Prettify Automake-computed names of compiled objects. |
24 --- 251,257 ---- |
24 src_bison_SHORTNAME = bison |
25 BUILT_SOURCES = $(GETOPT_H) $(STDBOOL_H) $(UNISTD_H) |
25 src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS) |
26 EXTRA_DIST = getopt_.h getopt_int.h stdbool_.h |
26 @@ -2624,6 +2633,10 @@ |
27 MOSTLYCLEANFILES = getopt.h getopt.h-t stdbool.h stdbool.h-t unistd.h |
27 all: $(BUILT_SOURCES) |
28 ! lib_LIBRARIES = $(YACC_LIBRARY) liby.so.1 |
28 $(MAKE) $(AM_MAKEFLAGS) all-recursive |
29 EXTRA_LIBRARIES = liby.a |
29 |
30 noinst_LIBRARIES = libbison.a |
30 +lib/liby.so.1: $(lib_liby_a_OBJECTS) $(lib_liby_a_DEPENDENCIES) |
31 liby_a_SOURCES = main.c yyerror.c |
31 + -rm -f lib/liby.so.1 |
32 *************** |
32 + $(CC) $(CFLAGS) -G -h liby.so.1 -o lib/liby.so.1 $(lib_liby_a_OBJECTS) $(lib_liby_a_LIBADD) |
33 *** 363,368 **** |
33 + |
34 --- 366,374 ---- |
34 .SUFFIXES: |
35 -rm -f liby.a |
35 .SUFFIXES: .gv .eps .pdf .png .yy .stamp .c .cc .dvi .l .ll .log .o .obj .ps .sed .sin .test .test$(EXEEXT) .trs .y |
36 $(liby_a_AR) liby.a $(liby_a_OBJECTS) $(liby_a_LIBADD) |
36 am--refresh: Makefile |
37 $(RANLIB) liby.a |
|
38 + liby.so.1: $(liby_a_OBJECTS) $(liby_a_DEPENDENCIES) |
|
39 + -rm -f liby.so.1 |
|
40 + $(CC) $(CFLAGS) -G -h liby.so.1 -o liby.so.1 $(liby_a_OBJECTS) |
|
41 |
|
42 mostlyclean-compile: |
|
43 -rm -f *.$(OBJEXT) |
|