CVS commit by deller: fix builddir != srcdir M +2 -2 Makefile.am 1.4 M +7 -5 kwalletif/Makefile.am 1.2 M +7 -5 kwalletif/kded/Makefile.am 1.2 --- kdeextragear-3/pwmanager/pwmanager/Makefile.am #1.3:1.4 @@ -3,5 +3,5 @@ KWALLETIF_LIB=-lpwmanager_kwalletif KWALLETIF_LIB_PATH=-L./kwalletif -KWALLETIF_INCLUDE_PATH=-I./kwalletif +KWALLETIF_INCLUDE_PATH=-I$(srcdir)/kwalletif KWALLETIF_DEP=kwalletif/libpwmanager_kwalletif.a endif @@ -11,5 +11,5 @@ KEYCARD_LIB=-lpwmanager_cardif KEYCARD_LIB_PATH=-L./cardif -KEYCARD_INCLUDE_PATH=-I./cardif +KEYCARD_INCLUDE_PATH=-I$(srcdir)/cardif KEYCARD_DEP=cardif/libpwmanager_cardif.a LIBCHIPCARD_LIB=-lchipcard --- kdeextragear-3/pwmanager/pwmanager/kwalletif/Makefile.am #1.1.1.1:1.2 @@ -8,16 +8,18 @@ stub-cond: - @ $(SHELL) ../mkdcopstub kwalletemu.kidl \ + @ $(SHELL) $(srcdir)/../mkdcopstub kwalletemu.kidl \ kwalletemu_skel.cpp kwalletemu_stub.cpp \ - kwalletemu_stub.h kwalletemu.h --conditional + kwalletemu_stub.h $(srcdir)/kwalletemu.h --conditional stub-clean: - @ $(SHELL) ../mkdcopstub kwalletemu.kidl \ + @ $(SHELL) $(srcdir)/../mkdcopstub kwalletemu.kidl \ kwalletemu_skel.cpp kwalletemu_stub.cpp \ - kwalletemu_stub.h kwalletemu.h --clean + kwalletemu_stub.h $(srcdir)/kwalletemu.h --clean + +CLEANFILES = kwalletemu.kidl kwalletemu_skel.cpp kwalletemu_stub.cpp kwalletemu_stub.h noinst_LIBRARIES = libpwmanager_kwalletif.a -INCLUDES = -I.. $(all_includes) +INCLUDES = -I$(srcdir)/.. $(all_includes) libpwmanager_kwalletif_a_SOURCES = kwalletif.cpp kwalletemu.cpp --- kdeextragear-3/pwmanager/pwmanager/kwalletif/kded/Makefile.am #1.1.1.1:1.2 @@ -2,14 +2,16 @@ stub-cond: - @ $(SHELL) ../../mkdcopstub kded_kwalletemu.kidl \ + @ $(SHELL) $(srcdir)/../../mkdcopstub kded_kwalletemu.kidl \ kded_kwalletemu_skel.cpp kded_kwalletemu_stub.cpp \ - kded_kwalletemu_stub.h kded_kwalletemu.h --conditional + kded_kwalletemu_stub.h $(srcdir)/kded_kwalletemu.h --conditional stub-clean: - @ $(SHELL) ../../mkdcopstub kded_kwalletemu.kidl \ + @ $(SHELL) $(srcdir)/../../mkdcopstub kded_kwalletemu.kidl \ kded_kwalletemu_skel.cpp kded_kwalletemu_stub.cpp \ - kded_kwalletemu_stub.h kded_kwalletemu.h --clean + kded_kwalletemu_stub.h $(srcdir)/kded_kwalletemu.h --clean -INCLUDES = -I.. -I../.. $(all_includes) +CLEANFILES = kded_kwalletemu.kidl kded_kwalletemu_skel.cpp kded_kwalletemu_stub.cpp kded_kwalletemu_stub.h + +INCLUDES = -I$(srcdir)/.. -I.. -I$(srcdir)/../.. -I../.. $(all_includes) noinst_HEADERS = kded_kwalletemu.h