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

Collapse All | Expand All

(-)Makefile.org (-6 / +5 lines)
Lines 5-13 Link Here
5
#######################################################
5
#######################################################
6
CXX=/usr/bin/g++
6
CXX=/usr/bin/g++
7
CC=/usr/bin/gcc
7
CC=/usr/bin/gcc
8
CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
8
INCLUDES=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
9
CXXLAGS=$(CFLAGS)
9
MYLDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
10
LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
11
CUSTOM=-DHAVE_SHADOW
10
CUSTOM=-DHAVE_SHADOW
12
PREFIX=/usr
11
PREFIX=/usr
13
CFGDIR=/etc
12
CFGDIR=/etc
Lines 26-38 Link Here
26
all: slim
25
all: slim
27
26
28
slim: $(OBJECTS)
27
slim: $(OBJECTS)
29
	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
28
	$(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OBJECTS) -o $(NAME)
30
29
31
.cpp.o:
30
.cpp.o:
32
	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
31
	$(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CUSTOM) -c $< -o $@
33
32
34
.c.o:
33
.c.o:
35
	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
34
	$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CUSTOM) -c $< -o $@
36
35
37
install: slim install-theme
36
install: slim install-theme
38
	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
37
	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim

Return to bug 107526