Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 80464 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-16 / +16 lines)
Lines 427-454 Link Here
427
## ******** start of editable section ********
427
## ******** start of editable section ********
428
#
428
#
429
#   ## The command calling Fortran compiler (without options)
429
#   ## The command calling Fortran compiler (without options)
430
# FCOM = g77
430
 FCOM = g77
431
#   ## Fortran compiler options
431
#   ## Fortran compiler options
432
# FOPTS = -O2 $(WARN)
432
 FOPTS = $(CFLAGS) $(WARN)
433
#   ## path to the C include files
433
#   ## path to the C include files
434
# INCLUDE =
434
 INCLUDE =
435
#   ## C compiler options
435
#   ## C compiler options
436
# COPTS = -O2 $(WARN) $(INCLUDE)
436
 COPTS = $(CFLAGS) $(WARN) $(INCLUDE)
437
#   ## libraries to link
437
#   ## libraries to link
438
# LINKLIBS = -L/usr/X11/lib -L/usr/X11R5/lib -L/usr/X11R6/lib \
438
 LINKLIBS = -L/usr/X11/lib -L/usr/X11R5/lib -L/usr/X11R6/lib \
439
#            -L/usr/X11R6/lib64 -lX11
439
            -L/usr/X11R6/lib64 -lX11
440
#   ## RANLIB is not used, but cannot be empty
440
#   ## RANLIB is not used, but cannot be empty
441
# RANLIB = echo
441
 RANLIB = echo
442
#   ## Fortran compiler adds underscore to each module
442
#   ## Fortran compiler adds underscore to each module
443
# UNDERSCORES = define
443
 UNDERSCORES = define
444
#   ## Fortran compiler changes the source code to lowercase
444
#   ## Fortran compiler changes the source code to lowercase
445
# LOWER_CASE = define
445
 LOWER_CASE = define
446
#
446
#
447
# FORCE =              # please don't change this setting
447
 FORCE =              # please don't change this setting
448
# PREPARE = prepare    # please don't change this setting
448
 PREPARE = prepare    # please don't change this setting
449
# PROG = jana2000      # please don't change this setting
449
 PROG = jana2000      # please don't change this setting
450
# CN11= a#             # please don't change this setting
450
 CN11= a#             # please don't change this setting
451
# INFO = LINUX - g77 compiler # please don't change this setting
451
 INFO = LINUX - g77 compiler # please don't change this setting
452
# 
452
# 
453
# # ******** end of editable section ********
453
# # ******** end of editable section ********
454
454
Lines 814-820 Link Here
814
           cp $(SPECIDIR)/MainUnit.c .; \
814
           cp $(SPECIDIR)/MainUnit.c .; \
815
           $(CCOM) $(COPTS) -c MainUnit.c
815
           $(CCOM) $(COPTS) -c MainUnit.c
816
MAKEEXE =  $(EXESPOL); \
816
MAKEEXE =  $(EXESPOL); \
817
           $(FCOM) $(FOPTS) -o $$NAME MainUnit.o $$NAME.o $(LIBS) $(LINKLIBS); \
817
           $(FCOM) $(FOPTS) $(LDFLAGS) -o $$NAME MainUnit.o $$NAME.o $(LIBS) $(LINKLIBS); \
818
           $(RMFILES); \
818
           $(RMFILES); \
819
           chmod 755 $$NAME
819
           chmod 755 $$NAME
820
MAKEJ2000 =  echo ' '; \
820
MAKEJ2000 =  echo ' '; \
Lines 837-843 Link Here
837
           ($(WRITE_FHEAD)) > $(FHEAD); \
837
           ($(WRITE_FHEAD)) > $(FHEAD); \
838
           cp $(SPECIDIR)/MainUnit.c $(SPECIDIR)/*.h $(FGPATH)/*.h .; \
838
           cp $(SPECIDIR)/MainUnit.c $(SPECIDIR)/*.h $(FGPATH)/*.h .; \
839
           $(CCOM) $(COPTS) -c MainUnit.c; \
839
           $(CCOM) $(COPTS) -c MainUnit.c; \
840
           $(FCOM) $(FOPTS) -o $$NAME MainUnit.o $(OBJLIST) \
840
           $(FCOM) $(FOPTS) $(LDFLAGS) -o $$NAME MainUnit.o $(OBJLIST) \
841
             $(LIBS) $(LINKLIBS); \
841
             $(LIBS) $(LINKLIBS); \
842
           $(RMFILES); \
842
           $(RMFILES); \
843
           chmod 755 $$NAME; echo ' '
843
           chmod 755 $$NAME; echo ' '

Return to bug 80464