diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-16 08:00:42 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-16 08:00:42 +0000 |
| commit | 66032f4eef5ba64aeb6491ad91feea445e40f0d7 (patch) | |
| tree | 1a8afb6e68766a33c1ed3b99c139354337c32db1 | |
| parent | 3524b34212fdab21c6882324b85efcc65dd6238c (diff) | |
miniclipboard: Fix Makefile issues.
| -rw-r--r-- | packages/miniclipboard/miniclipboard-0.3/makefile.patch | 26 | ||||
| -rw-r--r-- | packages/miniclipboard/miniclipboard_0.3.bb | 7 |
2 files changed, 30 insertions, 3 deletions
diff --git a/packages/miniclipboard/miniclipboard-0.3/makefile.patch b/packages/miniclipboard/miniclipboard-0.3/makefile.patch new file mode 100644 index 0000000000..790b82f305 --- /dev/null +++ b/packages/miniclipboard/miniclipboard-0.3/makefile.patch @@ -0,0 +1,26 @@ +Index: Makefile +=================================================================== +--- Makefile (Revision 9102) ++++ Makefile (Arbeitskopie) +@@ -6,16 +6,16 @@ + + MEMBERS = miniclipboard mbpixbuf mbtray + +-CFLAGS += -Wall ++PACKAGE_CFLAGS += -Wall `pkg-config --cflags x11` + ifeq ($(DEBUG),yes) +-CFLAGS += -O2 -g +-LDFLAGS = -g #-lefence ++PACKAGE_CFLAGS += -O2 -g ++LDFLAGS = -g + else +-CFLAGS += -Os -fomit-frame-pointer ++PACKAGE_CFLAGS += -Os -fomit-frame-pointer + endif + CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" + +-PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) -L/usr/X11R6/lib -lX11 -lXpm -lXext ++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(`pkg-config --libs x11`) -lXpm -lXext + + OBJS = $(patsubst %,%.o,$(MEMBERS)) + diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb index ba35902db7..1e4eef3eea 100644 --- a/packages/miniclipboard/miniclipboard_0.3.bb +++ b/packages/miniclipboard/miniclipboard_0.3.bb @@ -1,12 +1,13 @@ SECTION = "x11/utils" inherit gpe -LICENSE = "LGPL" +LICENSE = "GPL" DESCRIPTION = "Clipboard management application" DEPENDS = "virtual/libx11" RDEPENDS = "gdk-pixbuf-loader-xpm" -PR = "r1" +PR = "r2" -SRC_URI += "file://miniclipboard.desktop" +SRC_URI += "file://miniclipboard.desktop \ + file://makefile.patch;patch=1;pnum=0" do_install() { install -d ${D}${bindir} |