X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;ds=inline;f=src%2FMakefile.in;h=b11d4f7f2f5f18790e48a637be793b70bab2f8a6;hb=4f1b08903aa5a748e889ff08082515ed9e74c20f;hp=77b1a102222a749fefc97b36022309282f175adf;hpb=57023a0ee9fed57b5ee857b301be262984000944;p=cln.git diff --git a/src/Makefile.in b/src/Makefile.in index 77b1a10..b11d4f7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -10,6 +10,7 @@ top_srcdir = @top_srcdir@ prefix = @prefix@ local_prefix = /usr/local exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ datadir = @datadir@ libdir = @libdir@ includedir = @includedir@ @@ -21,6 +22,7 @@ DESTDIR = CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ # C++ compiler CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ @@ -122,7 +124,7 @@ alls : $(FILES_S) $(ASMFILES_S) allo : $(FILES_LO) $(ASMFILES_LO) -ASMFLAGS := +ASMFLAGS := @ASMFLAGS@ ifeq (@AS_UNDERSCORE@,true) ASMFLAGS += -DUNDERSCORE endif @@ -185,7 +187,7 @@ $(ASMFILES_LO) : %.lo : %.s || COMPILER_PATH=/bin $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(TARGET_ARCH) -c $< else $(ASMFILES_LO) : %.lo : %.s - $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(TARGET_ARCH) -c $< + $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(ASMFLAGS) $(TARGET_ARCH) -c $< endif endif @@ -203,7 +205,8 @@ ifeq ($(SUBDIR),.) $(ALLOBJECTS_LO) : $(SUBDIRS_TARGET) libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO) - $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO) + echo $(ALLOBJECTS_LO) | tr ' ' '\n' > libcln.objectlist + $(LIBTOOL_LINK) $(CXX) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) -objectlist libcln.objectlist install : all force $(MKDIR) $(DESTDIR)$(libdir) @@ -225,7 +228,7 @@ check : all mostlyclean : clean clean : force - $(RM) *.s *.o *.lo *.a *.la core + $(RM) *.s *.o *.lo *.a *.la *.objectlist core $(RM) -r .libs _libs distclean : clean