gsc/makefile.in | 14 +++++++------- gsi/makefile.in | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gsc/makefile.in b/gsc/makefile.in index 51155cd..f41f950 100644 --- a/gsc/makefile.in +++ b/gsc/makefile.in @@ -95,8 +95,8 @@ $(LIBRARY_MODULES_O_COMMA),_gambcgsc@obj@ LIBRARY_OBJECTS_IN_COMPILE_ORDER = $(LIBRARY_MODULES_O_IN_COMPILE_ORDER) \ $(LIBRARY_NORMAL_O_IN_COMPILE_ORDER) _gambcgsc@obj@ -MAKE_LIBRARY_LIBS = $(rootfromhere)/lib/$(GAMBCLIB) -MAKE_LIBRARY_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCLIB) +MAKE_LIBRARY_LIBS = +MAKE_LIBRARY_FOR_INSTALL_LIBS = EXECUTABLE = gsc@exe@ EXECUTABLE_NORMAL_C = @@ -123,8 +123,8 @@ $(EXECUTABLE_MODULES_O_COMMA),_gsc_@obj@ EXECUTABLE_OBJECTS_IN_COMPILE_ORDER = $(EXECUTABLE_MODULES_O_IN_COMPILE_ORDER) \ $(EXECUTABLE_NORMAL_O_IN_COMPILE_ORDER) _gsc_@obj@ -LINK_LIBS = $(GAMBCGSCLIB) $(rootfromhere)/lib/$(GAMBCLIB) -LINK_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCGSCLIB) $(libdir)/$(GAMBCLIB) +LINK_LIBS = -L. -lgambcgsc -L$(rootfromhere)/lib -lgambc +LINK_FOR_INSTALL_LIBS = -L$(libdir) -lgambcgsc -lgambc MODULES_SCM = $(LIBRARY_MODULES_SCM) $(EXECUTABLE_MODULES_SCM) MODULES_C = $(LIBRARY_MODULES_C) $(EXECUTABLE_MODULES_C) @@ -145,12 +145,12 @@ all-post: $(LIBRARY) $(EXECUTABLE) $(LIBRARY): $(LIBRARY_OBJECTS_IN_COMPILE_ORDER) rm -f $(LIBRARY) - @MAKE_LIBRARY@ + @MAKE_LIBRARY@ -L $(rootfromhere)/lib -lgambc _gambcgsc.c: $(LIBRARY_MODULES_C) $(rootfromhere)/lib/_gambc.c @SETDLPATH@ $(rootfromhere)/gsc-comp -:=$(srcdirpfx)$(rootfromhere) -f -link -l $(srcdirpfx)$(rootfromhere)/lib/_gambc -o $@ $(LIBRARY_MODULES_C) -$(EXECUTABLE): $(EXECUTABLE_OBJECTS_IN_COMPILE_ORDER) $(LINK_LIBS) +$(EXECUTABLE): $(EXECUTABLE_OBJECTS_IN_COMPILE_ORDER) @LINK@ _gsc_.c: $(EXECUTABLE_MODULES_C) _gambcgsc.c @@ -180,7 +180,7 @@ install-pre: install-post: all $(srcdirpfx)$(rootfromhere)/mkidirs $(bindir) $(INSTALL_DATA) $(srcdirpfx)_gambcgsc.c $(libdir)/_gambcgsc.c - @MAKE_LIBRARY_FOR_INSTALL@ + @MAKE_LIBRARY_FOR_INSTALL@ -L $(libdir) -lgambc $(INSTALL_LIB) $(LIBRARY) $(libdir)/$(LIBRARY) @FIXLIB@ $(libdir)/$(LIBRARY) #for library in $(LIBRARIES_SCM); do \ diff --git a/gsi/makefile.in b/gsi/makefile.in index 446a04d..99cc86f 100644 --- a/gsi/makefile.in +++ b/gsi/makefile.in @@ -81,8 +81,8 @@ $(LIBRARY_MODULES_O_COMMA),_gambcgsi@obj@ LIBRARY_OBJECTS_IN_COMPILE_ORDER = $(LIBRARY_MODULES_O_IN_COMPILE_ORDER) \ $(LIBRARY_NORMAL_O_IN_COMPILE_ORDER) _gambcgsi@obj@ -MAKE_LIBRARY_LIBS = $(rootfromhere)/lib/$(GAMBCLIB) -MAKE_LIBRARY_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCLIB) +MAKE_LIBRARY_LIBS = +MAKE_LIBRARY_FOR_INSTALL_LIBS = EXECUTABLE = gsi@exe@ EXECUTABLE_NORMAL_C = @@ -109,8 +109,8 @@ $(EXECUTABLE_MODULES_O_COMMA),_gsi_@obj@ EXECUTABLE_OBJECTS_IN_COMPILE_ORDER = $(EXECUTABLE_MODULES_O_IN_COMPILE_ORDER) \ $(EXECUTABLE_NORMAL_O_IN_COMPILE_ORDER) _gsi_@obj@ -LINK_LIBS = $(GAMBCGSILIB) $(rootfromhere)/lib/$(GAMBCLIB) -LINK_FOR_INSTALL_LIBS = $(libdir)/$(GAMBCGSILIB) $(libdir)/$(GAMBCLIB) +LINK_LIBS = -L. -lgambcgsi -L$(rootfromhere)/lib -lgambc +LINK_FOR_INSTALL_LIBS = -L$(libdir) -lgambcgsi -lgambc MODULES_SCM = $(LIBRARY_MODULES_SCM) $(EXECUTABLE_MODULES_SCM) MODULES_C = $(LIBRARY_MODULES_C) $(EXECUTABLE_MODULES_C) @@ -130,12 +130,12 @@ all-post: $(LIBRARY) $(EXECUTABLE) $(LIBRARY): $(LIBRARY_OBJECTS_IN_COMPILE_ORDER) rm -f $(LIBRARY) - @MAKE_LIBRARY@ + @MAKE_LIBRARY@ -L $(rootfromhere)/lib -lgambc _gambcgsi.c: $(LIBRARY_MODULES_C) $(rootfromhere)/lib/_gambc.c @SETDLPATH@ $(rootfromhere)/gsc-comp -:=$(srcdirpfx)$(rootfromhere) -f -link -l $(srcdirpfx)$(rootfromhere)/lib/_gambc -o $@ $(LIBRARY_MODULES_C) -$(EXECUTABLE): $(EXECUTABLE_OBJECTS_IN_COMPILE_ORDER) $(LINK_LIBS) +$(EXECUTABLE): $(EXECUTABLE_OBJECTS_IN_COMPILE_ORDER) @LINK@ _gsi_.c: $(EXECUTABLE_MODULES_C) _gambcgsi.c @@ -164,7 +164,7 @@ install-pre: install-post: all $(srcdirpfx)$(rootfromhere)/mkidirs $(bindir) $(INSTALL_DATA) $(srcdirpfx)_gambcgsi.c $(libdir)/_gambcgsi.c - @MAKE_LIBRARY_FOR_INSTALL@ + @MAKE_LIBRARY_FOR_INSTALL@ -L $(libdir) -lgambc $(INSTALL_LIB) $(LIBRARY) $(libdir)/$(LIBRARY) @FIXLIB@ $(libdir)/$(LIBRARY) #for library in $(LIBRARIES_SCM); do \
