equal
  deleted
  inserted
  replaced
  
    
    
|      3 INCLUDEDIRS ?= -I/home/marci/boost -I/usr/local/cplex/cplex75/include -I../../{marci,alpar,klao,akos,athos} -I. -I../../.. -I../.. -I..# -I$(GLPKROOT)/include |      3 INCLUDEDIRS ?= -I/home/marci/boost -I/usr/local/cplex/cplex75/include -I../../{marci,alpar,klao,akos,athos} -I. -I../../.. -I../.. -I..# -I$(GLPKROOT)/include | 
|      4 #INCLUDEDIRS ?= -I../.. -I../.. -I../../{marci,jacint,alpar,klao,akos} -I/usr/local/glpk-4.4/include |      4 #INCLUDEDIRS ?= -I../.. -I../.. -I../../{marci,jacint,alpar,klao,akos} -I/usr/local/glpk-4.4/include | 
|      5 CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic |      5 CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic | 
|      6 LDFLAGS  =  -lglpk#-lcplex -lm -lpthread -lilocplex -L/usr/local/cplex/cplex75/lib/i86_linux2_glibc2.2_gcc3.0/static_mt# -L$(GLPKROOT)/lib |      6 LDFLAGS  =  -lglpk#-lcplex -lm -lpthread -lilocplex -L/usr/local/cplex/cplex75/lib/i86_linux2_glibc2.2_gcc3.0/static_mt# -L$(GLPKROOT)/lib | 
|      7  |      7  | 
|      8 BINARIES = max_flow_expression expression_test max_flow_by_lp# sample sample2 sample11 sample15 |      8 BINARIES = magic_square max_flow_expression expression_test max_flow_by_lp# sample sample2 sample11 sample15 | 
|      9  |      9  | 
|     10 #include ../makefile |     10 #include ../makefile | 
|     11  |     11  | 
|     12 # Hat, ez elismerem, hogy nagyon ronda, de mukodik minden altalam |     12 # Hat, ez elismerem, hogy nagyon ronda, de mukodik minden altalam | 
|     13 # ismert rendszeren :-)  (Misi) |     13 # ismert rendszeren :-)  (Misi) |