diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /libxsettings-client | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'libxsettings-client')
| -rw-r--r-- | libxsettings-client/libxsettings-client_0.12.bb | 0 | ||||
| -rw-r--r-- | libxsettings-client/make_pkgconfig_x11.patch | 21 |
2 files changed, 0 insertions, 21 deletions
diff --git a/libxsettings-client/libxsettings-client_0.12.bb b/libxsettings-client/libxsettings-client_0.12.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/libxsettings-client/libxsettings-client_0.12.bb +++ /dev/null diff --git a/libxsettings-client/make_pkgconfig_x11.patch b/libxsettings-client/make_pkgconfig_x11.patch deleted file mode 100644 index 3a386672d2..0000000000 --- a/libxsettings-client/make_pkgconfig_x11.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- libxsettings-client0-0.12/Makefile.old 2004-04-20 16:48:18.000000000 +1000 -+++ libxsettings-client0-0.12/Makefile 2004-04-20 16:58:07.000000000 +1000 -@@ -20,6 +20,9 @@ - CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" - CPPFLAGS += -I../libxsettings - -+CFLAGS += `pkg-config --cflags x11` -+LDFLAGS += `pkg-config --ldflags x11` -+ - XSETTINGS_OBJS = $(patsubst %,%.os,$(XSETTINGS_MEMBERS)) - DEPS = $(patsubst %,%.d,$(MEMBERS) $(XSETTINGS_MEMBERS)) - SOURCES = $(patsubst %,%.c,$(MEMBERS) $(XSETTINGS_MEMBERS)) -@@ -39,7 +42,7 @@ - ln -sf $^ $@ - - $(LIBXSETTINGS_SO): $(XSETTINGS_OBJS) -- $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles -L/usr/X11R6/lib -lX11 -L../libxsettings -lXsettings -+ $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles $(LDFLAGS) -L../libxsettings -lXsettings - - install-program: $(LIBXSETTINGS_SO) - install -d $(DESTDIR)$(PREFIX)/lib |