-libyazcpp_la_SOURCES=yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
- yaz-z-assoc.cpp yaz-proxy.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \
+DISTCLEANFILES = yaz++-config
+
+libyazcpp_la_SOURCES=socket-observer.cpp pdu-observer.cpp query.cpp \
+ z-server.cpp \
+ yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
+ yaz-z-assoc.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \