100 lines
3.5 KiB
Diff
100 lines
3.5 KiB
Diff
--- Makefile.orig 2007-12-03 17:38:59.450705131 +0000
|
|
+++ Makefile 2007-12-03 17:46:11.117238346 +0000
|
|
@@ -661,17 +661,17 @@
|
|
"PIC=$(PIC_$(OS)_$(ENV))" \
|
|
"CCx=$(CC_$(OS)_$(ENV))" \
|
|
"LDx=$(LD_$(OS)_$(ENV))" \
|
|
-"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
|
|
+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
|
|
"SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
|
|
"SHAREDEXT=$(SHAREDEXT_$(OS))" \
|
|
-"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
|
|
+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
|
|
"AROPTIONS=$(AROPTIONS_$(OS))" \
|
|
"RANLIB=$(RANLIB_$(OS))" \
|
|
all
|
|
@cd $(TOOLSsrcDIR); $(MAKE) \
|
|
"CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
|
|
"CCx=$(CC_$(OS)_$(ENV))" \
|
|
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
|
|
+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
|
|
"COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
|
|
"SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
|
|
"CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
|
|
@@ -681,9 +681,9 @@
|
|
"FCx=$(FC_$(OS))" \
|
|
"CCx=$(CC_$(OS)_$(ENV))" \
|
|
"SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
|
|
-"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
|
|
+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
|
|
"FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
|
|
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
|
|
+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
|
|
"COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
|
|
"SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
|
|
"SHAREDEXT=$(SHAREDEXT_$(OS))" \
|
|
@@ -711,12 +711,17 @@
|
|
install.all: install.definitions install.include install.lib \
|
|
install.tools install.help_ notify.user
|
|
|
|
-install.definitions: create.bin copy.definitions change.definitions
|
|
+install.definitions: create.bin
|
|
install.include: create.include copy.include
|
|
install.tools: create.bin copy.tools
|
|
install.help_: create.help copy.help
|
|
|
|
install.lib: create.lib copy.lib.a
|
|
+ @if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
|
|
+ $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
|
|
+ else \
|
|
+ $(NULL) ; \
|
|
+ fi
|
|
@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
|
|
$(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
|
|
else \
|
|
@@ -811,8 +816,8 @@
|
|
cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
|
|
|
|
copy.lib.so:
|
|
- @echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
|
|
- cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
|
|
+ @echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
|
|
+ cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
|
|
|
|
copy.lib.sl:
|
|
@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
|
|
@@ -1851,15 +1856,15 @@
|
|
show.supported:
|
|
@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
|
|
@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
|
|
- @echo FOPTIONS=$(FOPTIONS_$(OS))
|
|
+ @echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
|
|
@echo FOPTIONSld=$(FOPTIONSld_$(OS))
|
|
@echo SHAREDEXT=$(SHAREDEXT_$(OS))
|
|
- @echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
|
|
+ @echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
|
|
@echo RANLIB=$(RANLIB_$(OS))
|
|
@echo FCx=$(FC_$(OS))
|
|
@echo CCx=$(CC_$(OS)_$(ENV))
|
|
@echo PIC=$(PIC_$(OS)_$(ENV))
|
|
- @echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
|
|
+ @echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
|
|
@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
|
|
@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
|
|
@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
|
|
--- src/tools/Makefile.orig 2009-02-02 18:02:55.000000000 +0000
|
|
+++ src/tools/Makefile 2009-02-02 18:07:31.000000000 +0000
|
|
@@ -35,10 +35,10 @@
|
|
INCLUDEcdf= ../include
|
|
|
|
CC=$(CCx)
|
|
-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
|
|
-CFLAGSld=$(COPTIONSld)
|
|
+CFLAGS:= $(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
|
|
+CFLAGSld=$(LDFLAGS) $(COPTIONSld)
|
|
|
|
-LIBCDFa=../lib/libcdf.a
|
|
+LIBCDFa=../lib/libcdf.so.3
|
|
|
|
LIBs1=$(LIBCDFa) $(SYSLIBS)
|
|
LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS)
|