diff -ur wxaui-0.9.1/Makefile wxaui-0.9.1.new/Makefile --- wxaui-0.9.1/Makefile 2006-01-10 15:11:39.000000000 -0200 +++ wxaui-0.9.1.new/Makefile 2006-02-21 19:28:43.000000000 -0300 @@ -14,36 +14,51 @@ # change these two to match your setup -WX_DIR := ../supp/wxGTK-2.6.2 -WX_CONFIG := ${WX_DIR}/lib/wx/config/inplace-gtk2-unicode-debug-static-2.6 +WX_DIR := $(shell wx-config --exec-prefix) +WX_CONFIG := ${WX_DIR}/bin/wx-config ${WXPARAM} -WX_CFLAGS := $(shell ${WX_CONFIG} --prefix=${WX_DIR} --cppflags) -WX_LIBS := $(shell ${WX_CONFIG} --prefix=${WX_DIR} --libs) +WX_CFLAGS := $(shell ${WX_CONFIG} --cppflags) +WX_LIBS := $(shell ${WX_CONFIG} --libs) +WX_BASENAME := $(shell ${WX_CONFIG} --basename) +WX_INCDIR := $(DESTDIR)/$(shell ${WX_CONFIG} --cppflags | sed 's/.*-I\([^ ]*\).*/\1/g')/wx +WX_LIBDIR := $(DESTDIR)/$(WX_DIR)/lib + +LIBNAME := lib$(WX_BASENAME)_aui-2.6.la DEFINES = -CPP = g++ +CXX = g++ CFLAGS = ${WX_CFLAGS} -g -ggdb -INCLUDES = -I${WXDIR}/include -I./include +INCLUDES = -I./include OBJECTS = \ - manager.o + manager.lo VPATH=src:lib -all: libwxaui.a sample +all: lib/$(LIBNAME) -libwxaui.a: $(OBJECTS) - ar rc lib/libwxaui.a $(OBJECTS) - ranlib lib/libwxaui.a +lib/$(LIBNAME): $(OBJECTS) + libtool --tag=CXX --mode=link $(CXX) -o $@ $(OBJECTS) -rpath $(WX_LIBDIR) $(WX_LIBS) sample: $(OBJECTS) cd sample && $(MAKE) -w -f Makefile clean: - rm -f *.o lib/libwxaui.a sample/*.o sample/wxauitest + rm -rf *.o *.lo lib/*.la lib/.libs sample/*.lo sample/wxauitest + +$(OBJECTS): %.lo : %.cpp + libtool --tag=CXX --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $< + +install: lib/$(LIBNAME) + mkdir -p $(WX_LIBDIR) $(WX_INCDIR) + libtool --mode=install cp $< $(WX_LIBDIR) + libtool --mode=install cp include/manager.h $(WX_INCDIR) + libtool -n --mode=finish $(WX_LIBDIR) + +uninstall: + libtool --mode=uninstall rm $(WX_LIBDIR)/$(LIBNAME).la + libtool --mode=uninstall rm $(WX_INCDIR)/manager.h -$(OBJECTS): %.o : %.cpp - $(CPP) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $<