diff --git a/DBusKit/Makefile b/DBusKit/Makefile index 830fa0bfdcfb..a5114d8532aa 100644 --- a/DBusKit/Makefile +++ b/DBusKit/Makefile @@ -20,7 +20,7 @@ LDFLAGS+= -g ${FMWK_LDFLAGS} -L/usr/local/lib ${DBUS_LDFLAGS} \ -L${BUILDROOT}/System/Library/Frameworks/CoreFoundation.framework/Versions/Current \ -lFoundation -lCoreFoundation -lobjc -lm -build: copydbus all +build: all copydbus copydbus: rm -rf ${FRAMEWORK}.framework/Headers/dbus diff --git a/Makefile b/Makefile index 9ff7bb26cda8..7bf892aa2fd2 100644 --- a/Makefile +++ b/Makefile @@ -212,6 +212,10 @@ AppKit.framework: make -C ${TOPDIR}/AppKit BUILDROOT=${BUILDROOT} clean build cp -Rvf ${TOPDIR}/${.TARGET:R}/${.TARGET} ${BUILDROOT}/System/Library/Frameworks +DBusKit.framework: + rm -rf ${TOPDIR}/DBusKit/${.TARGET} + make -C ${TOPDIR}/DBusKit BUILDROOT=${BUILDROOT} clean build + cp -Rvf ${TOPDIR}/${.TARGET:R}/${.TARGET} ${BUILDROOT}/System/Library/Frameworks airyx-package: tar cJ -C ${BUILDROOT} --gid 0 --uid 0 -f ${RLSDIR}/airyx.txz . diff --git a/examples/app/Makefile b/examples/app/Makefile index b99d1ede19e4..979aa099b06a 100644 --- a/examples/app/Makefile +++ b/examples/app/Makefile @@ -28,9 +28,8 @@ SRCS=main.m MyView.m MK_DEBUG_FILES=no RESOURCES=rsc helium.jpg CocoaDemo.png SLF=/System/Library/Frameworks -ZF=/Users/zoe/helium -FRAMEWORKS=${ZF}/AppKit/AppKit ${SLF}/CoreGraphics ${SLF}/Onyx2D ${SLF}/OpenGL \ - ${ZF}/Foundation/Foundation ${SLF}/CoreFoundation ${ZF}/DBusKit/DBusKit +FRAMEWORKS=${SLF}/AppKit/AppKit ${SLF}/CoreGraphics ${SLF}/Onyx2D ${SLF}/OpenGL \ + ${SLF}/Foundation/Foundation ${SLF}/CoreFoundation ${SLF}/DBusKit/DBusKit LDFLAGS+=-L/usr/local/lib -lGL build: all