Changeset db71e2a in mainline for uspace/srv/net/dnsrsrv/Makefile

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/net/dnsrsrv/Makefile (moved) (moved from uspace/srv/bd/ata_bd/Makefile ) (2 diffs)

uspace/srv/net/dnsrsrv/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2012 Jiri Svoboda
 # All rights reserved.
 #
@@ -29 +28 @@
 
 USPACE_PREFIX = ../../..
-BINARY = ata_bd
+BINARY = dnsrsrv
 
 SOURCES = \
-        ata_bd.c
+        dns_msg.c \
+        dnsrsrv.c \
+        query.c \
+        transport.c
 
 include $(USPACE_PREFIX)/Makefile.common