diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
| commit | 3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch) | |
| tree | 642c13416b99e80f0871cdc6668e832e635dfb48 /recipes/literki/literki/makefile.patch | |
| parent | c400c874f2ac9233b8a43a73309b6e7907289c54 (diff) | |
| parent | 13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff) | |
| download | openembedded-testing.tar.gz | |
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'recipes/literki/literki/makefile.patch')
| -rw-r--r-- | recipes/literki/literki/makefile.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/recipes/literki/literki/makefile.patch b/recipes/literki/literki/makefile.patch new file mode 100644 index 0000000000..c6f78f0754 --- /dev/null +++ b/recipes/literki/literki/makefile.patch @@ -0,0 +1,61 @@ +commit d2ad0f4591619aa176edfb618971d0c8ff608a69 +Author: Yann Dirson <ydirson@altern.org> +Date: Tue Aug 3 22:35:25 2010 +0200 + + Make the Makefile suitable for packaging and cross-compiling. + + This includes normalisation of variable names to minimize packaging + work, as well as an install target. + + Signed-off-by: Yann Dirson <ydirson@altern.org> + +diff --git a/Makefile b/Makefile +index f300953..834e6f6 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,18 +1,39 @@ ++DESTDIR= ++prefix=/usr ++bindir=$(prefix)/bin ++datadir=$(prefix)/share ++sysconfdir=/etc ++ + PLIKI=display.o keymap.o keys.o keyboard.o applet.o launcher.o logger.o slider.o image_cache.o touchpad.o switcher.o vibrator.o + + LIBS=-lX11 -lXext -lXtst -lpthread -lXrandr -lpng -lfakekey + +-CXXCOMPILE=g++ ++CXX=g++ ++ ++MYCFLAGS = -g $(shell freetype-config --cflags) ++MYLDFLAGS = -g $(shell freetype-config --libs) + +-CFLAGS=-g `freetype-config --cflags` +-LDFLAGS=-g `freetype-config --libs` ++all: literki + + %.o: %.cpp +- $(CXXCOMPILE) $(CFLAGS) -c $< ++ $(CXX) $(CXXFLAGS) $(MYCFLAGS) -c $< + +-all: $(PLIKI) +- g++ $(LIBS) $(LDFLAGS) -o literki $(PLIKI) ++literki: $(PLIKI) ++ $(CXX) $(LDFLAGS) $(LIBS) $(MYLDFLAGS) -o $@ $^ + + clean: + rm *.o + rm literki ++ ++install: ++ install -d -m755 \ ++ $(DESTDIR)$(bindir) \ ++ $(DESTDIR)$(sysconfdir)/literki \ ++ $(DESTDIR)$(datadir)/applications \ ++ $(DESTDIR)$(datadir)/pixmaps \ ++ $(DESTDIR)$(datadir)/literki/png ++ install -m755 literki $(DESTDIR)$(bindir)/ ++ install -m755 literki.conf *layout.conf $(DESTDIR)$(sysconfdir)/literki/ ++ install -m644 png/* $(DESTDIR)$(datadir)/literki/png/ ++ install -m644 literki.desktop $(DESTDIR)$(datadir)/applications/ ++ install -m644 literki.png $(DESTDIR)$(datadir)/pixmaps/ |