View | Details | Raw Unified
Collapse All | Expand All

(-) file_not_specified_in_diff (-16 / +10 lines)
 Lines 18-26    Link Here  
MANMODE ?= 644
MANMODE ?= 644
MANDIRMODE ?= 755
MANDIRMODE ?= 755
INSTALL ?= install
INSTALL ?= install
LINK_FLAGS ?= -Wl,-E
 
LDFLAGS += -Wl,-E
 
CC ?= gcc
CC ?= gcc
STRIP ?= -s
 

        
GKRELLMD_INCLUDES = gkrellmd.h
GKRELLMD_INCLUDES = gkrellmd.h

        

  

    

    

       Lines 30-36
       
    
  Link Here 
    

  

        
GLIB12_INCLUDE = `glib-config --cflags`
GLIB12_INCLUDE = `glib-config --cflags`

        
GLIB12_LIB = `glib-config --libs glib gmodule`
GLIB12_LIB = `glib-config --libs glib gmodule`

        

            

              
FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)

              
FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)

            

        
ifeq ($(glib12),1)
ifeq ($(glib12),1)

        
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)

        
endif
endif

  

    

    

       Lines 88-98
       
    
  Link Here 
    

  

        
all:	gkrellmd
all:	gkrellmd

        

        
gkrellmd: $(OBJS)
gkrellmd: $(OBJS)

            

              
	$(CC) $(OBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)

              
	$(CC) $(OBJS) -o gkrellmd $(LIBS) $(LDFLAGS)

            

        

        
static: $(OBJS)
static: $(OBJS)

        
	$(CC) $(OBJS) -o gkrellmd.static -static \
	$(CC) $(OBJS) -o gkrellmd.static -static \

            

              
		$(LIBS) $(LINK_FLAGS)

              
		$(LIBS) $(LDFLAGS)

            

        

        
freebsd2:
freebsd2:

        
	$(MAKE) GTK_CONFIG=gtk12-config \
	$(MAKE) GTK_CONFIG=gtk12-config \

  

    

    

       Lines 129-139
       
    
  Link Here 
    

  

        

        
install:
install:

        
	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)

            

              
	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)

              
	$(INSTALL) -c -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)

            

        
	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2

        
	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2

            

              
	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)

              
            

            

              
	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1

              
            

        

        
uninstall:
uninstall:

        
	rm -f $(SINSTALLDIR)/$(PACKAGE_D)
	rm -f $(SINSTALLDIR)/$(PACKAGE_D)

  

    

    

       Lines 16-22
       
    
  Link Here 
    

  

        
MANMODE ?= 644
MANMODE ?= 644

        
MANDIRMODE ?= 755
MANDIRMODE ?= 755

        
INSTALL ?= install
INSTALL ?= install

            

              
LINK_FLAGS ?= -Wl,-E

              
LDFLAGS += -Wl,-E

            

        
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE

        

        
ifeq ($(without-gnutls),1)
ifeq ($(without-gnutls),1)

  

    

    

       Lines 48-54
       
    
  Link Here 
    

  

        
endif
endif

        

        
CC ?= gcc
CC ?= gcc

            

              
STRIP ?= -s

              
            

        

        
GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h

        

  

    

    

       Lines 56-62
       
    
  Link Here 
    

  

        

        
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`

        

            

              
FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)

              
FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)

            

        
FLAGS+= $(PTHREAD_INC)
FLAGS+= $(PTHREAD_INC)

        

        
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS)
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS)

  

    

    

       Lines 95-105
       
    
  Link Here 
    

  

        
all:	gkrellm
all:	gkrellm

        

        
gkrellm: $(OBJS) $(EXTRAOBJS)
gkrellm: $(OBJS) $(EXTRAOBJS)

            

              
	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LINK_FLAGS)

              
	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LDFLAGS)

            

        

        
static: $(OBJS) $(EXTRAOBJS)
static: $(OBJS) $(EXTRAOBJS)

        
	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm.static -static \
	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm.static -static \

            

              
		$(LIBS) $(LINK_FLAGS)

              
		$(LIBS) $(LDFLAGS)

            

        

        
freebsd2:
freebsd2:

        
ifeq ($(HAVE_SSL),1)
ifeq ($(HAVE_SSL),1)

  

    

    

       Lines 144-154
       
    
  Link Here 
    

  

        

        
install:
install:

        
	$(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
	$(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)

            

              
	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE)

              
	$(INSTALL) -c -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE)

            

        
	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2

        
	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2

            

              
	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)

              
            

            

              
	$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1

              
            

        

        
uninstall:
uninstall:

        
	rm -f $(INSTALLDIR)/$(PACKAGE)
	rm -f $(INSTALLDIR)/$(PACKAGE)