Skip to content

Commit 5687927

Browse files
committed
Move sdwrap from src to examples directory.
1 parent 6d546f0 commit 5687927

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+29
-28
lines changed

Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
ACLOCAL_AMFLAGS = -I m4
44

55
SUBDIRS = \
6-
src
6+
src \
7+
examples
78

89

910
wxservdiscdocdir = ${datadir}/doc/wxservdisc

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ AM_PROG_LIBTOOL
111111
AC_OUTPUT([
112112
Makefile
113113
src/Makefile
114-
src/wxServDisc/Makefile
115-
src/sdwrap/Makefile
114+
examples/Makefile
115+
examples/sdwrap/Makefile
116116
])

examples/Makefile.am

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Process this file with automake to produce Makefile.in
2+
3+
SUBDIRS = \
4+
sdwrap
5+

src/sdwrap/Makefile.am examples/sdwrap/Makefile.am

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44

55
AM_CPPFLAGS = \
6-
$(WX_CPPFLAGS)
6+
$(WX_CPPFLAGS)\
7+
-I../../src
78

89
AM_CXXFLAGS =\
910
-Wall \
@@ -56,7 +57,7 @@ endif
5657

5758

5859
sdwrap_LDADD = \
59-
../wxServDisc/libwxservdisc.la \
60+
../../src/libwxservdisc.la \
6061
$(WX_LIBS)
6162

6263

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/sdwrap/gui/MyFrameMain.h examples/sdwrap/gui/MyFrameMain.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828

2929
#include "FrameMain.h"
30-
#include "../wxServDisc/wxServDisc.h"
30+
#include <wxServDisc.h>
3131

3232

3333

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/wxServDisc/1035.c src/1035.c

File renamed without changes.

src/wxServDisc/1035.h src/1035.h

File renamed without changes.

src/Makefile.am

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1-
## Process this file with automake to produce Makefile.in
1+
## Makefile.am -- Process this file with automake to produce Makefile.in
2+
3+
4+
lib_LTLIBRARIES = libwxservdisc.la
5+
libwxservdisc_la_SOURCES = 1035.c mdnsd.c wxServDisc.cpp 1035.h mdnsd.h
6+
include_HEADERS = wxServDisc.h
7+
libwxservdisc_la_CFLAGS = -g -Wall
8+
libwxservdisc_la_CXXFLAGS = -g -Wall
9+
libwxservdisc_la_CPPFLAGS = $(WX_CPPFLAGS)
10+
libwxservdisc_la_LDFLAGS = $(WX_LDFLAGS)
11+
if MINGW
12+
libwxservdisc_la_LIBADD = -lws2_32
13+
libwxservdisc_la_LDFLAGS += -no-undefined -version-info 0:3:0 -static-libgcc -static-libstdc++
14+
endif
15+
16+
217

3-
SUBDIRS = \
4-
wxServDisc \
5-
sdwrap
618

File renamed without changes.
File renamed without changes.

src/wxServDisc/mdnsd.c src/mdnsd.c

File renamed without changes.

src/wxServDisc/mdnsd.h src/mdnsd.h

File renamed without changes.
File renamed without changes.
File renamed without changes.

src/wxServDisc/Makefile.am

-18
This file was deleted.

0 commit comments

Comments
 (0)